projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[powerpc.git]
/
drivers
/
fc4
/
socal.c
diff --git
a/drivers/fc4/socal.c
b/drivers/fc4/socal.c
index
f52d1e5
..
c903ebf
100644
(file)
--- a/
drivers/fc4/socal.c
+++ b/
drivers/fc4/socal.c
@@
-17,7
+17,6
@@
static char *version =
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
@@
-404,7
+403,7
@@
update_out:
}
}
}
}
-static irqreturn_t socal_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t socal_intr(int irq, void *dev_id)
{
u32 cmd;
unsigned long flags;
{
u32 cmd;
unsigned long flags;
@@
-761,7
+760,7
@@
static inline void socal_init(struct sbus_dev *sdev, int no)
irq = sdev->irqs[0];
irq = sdev->irqs[0];
- if (request_irq (irq, socal_intr,
SA_SHIRQ
, "SOCAL", (void *)s)) {
+ if (request_irq (irq, socal_intr,
IRQF_SHARED
, "SOCAL", (void *)s)) {
socal_printk ("Cannot order irq %d to go\n", irq);
socals = s->next;
return;
socal_printk ("Cannot order irq %d to go\n", irq);
socals = s->next;
return;