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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[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
86f61ce
..
9d44ae1
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/irq.c
+++ b/
arch/mips/momentum/ocelot_c/irq.c
@@
-52,11
+52,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
, CPU_MASK_NONE, "cascade via FPGA", NULL, NULL
+ no_action,
IRQF_DISABLED
, CPU_MASK_NONE, "cascade via FPGA", NULL, NULL
};
static struct irqaction cascade_mv64340 = {
};
static struct irqaction cascade_mv64340 = {
- no_action,
SA_INTERRUPT
, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL
+ no_action,
IRQF_DISABLED
, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL
};
extern void ll_uart_irq(struct pt_regs *regs);
};
extern void ll_uart_irq(struct pt_regs *regs);