git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
fc4
/
soc.c
diff --git
a/drivers/fc4/soc.c
b/drivers/fc4/soc.c
index
ec1f947
..
b09dfc7
100644
(file)
--- a/
drivers/fc4/soc.c
+++ b/
drivers/fc4/soc.c
@@
-334,7
+334,7
@@
update_out:
}
}
}
}
-static irqreturn_t soc_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t soc_intr(int irq, void *dev_id)
{
u32 cmd;
unsigned long flags;
{
u32 cmd;
unsigned long flags;
@@
-637,13
+637,13
@@
static inline void soc_init(struct sbus_dev *sdev, int no)
irq = sdev->irqs[0];
irq = sdev->irqs[0];
- if (request_irq (irq, soc_intr,
SA_SHIRQ
, "SOC", (void *)s)) {
+ if (request_irq (irq, soc_intr,
IRQF_SHARED
, "SOC", (void *)s)) {
soc_printk ("Cannot order irq %d to go\n", irq);
socs = s->next;
return;
}
soc_printk ("Cannot order irq %d to go\n", irq);
socs = s->next;
return;
}
- SOD(("SOC uses IRQ
%s\n", __irq_itoa(irq)
))
+ SOD(("SOC uses IRQ
%d\n", irq
))
s->port[0].fc.irq = irq;
s->port[1].fc.irq = irq;
s->port[0].fc.irq = irq;
s->port[1].fc.irq = irq;