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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_c
/
irq.c
diff --git
a/arch/mips/momentum/ocelot_c/irq.c
b/arch/mips/momentum/ocelot_c/irq.c
index
d12f5be
..
13dd8bd
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/irq.c
+++ b/
arch/mips/momentum/ocelot_c/irq.c
@@
-44,8
+44,9
@@
#include <asm/bitops.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/bitops.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
-#include <asm/irq.h>
+#include <asm/irq
_cpu
.h>
#include <asm/mipsregs.h>
#include <asm/mipsregs.h>
+#include <asm/mv64340.h>
#include <asm/system.h>
extern asmlinkage void ocelot_handle_int(void);
#include <asm/system.h>
extern asmlinkage void ocelot_handle_int(void);
@@
-53,11
+54,11
@@
extern void uart_irq_init(void);
extern void cpci_irq_init(void);
static struct irqaction cascade_fpga = {
extern void cpci_irq_init(void);
static struct irqaction cascade_fpga = {
- no_action, SA_INTERRUPT,
0
, "cascade via FPGA", NULL, NULL
+ no_action, SA_INTERRUPT,
CPU_MASK_NONE
, "cascade via FPGA", NULL, NULL
};
static struct irqaction cascade_mv64340 = {
};
static struct irqaction cascade_mv64340 = {
- no_action, SA_INTERRUPT,
0
, "cascade via MV64340", NULL, NULL
+ no_action, SA_INTERRUPT,
CPU_MASK_NONE
, "cascade via MV64340", NULL, NULL
};
void __init init_IRQ(void)
};
void __init init_IRQ(void)