diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2007-10-23 09:06:38 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-07 22:15:29 -0500 |
commit | 3a800ff50a107b1b562f17e087a65e4c18e3a35c (patch) | |
tree | 0c6ce80624733ad5355896b077adcc462c8ac828 /arch | |
parent | 1db3e890aed3ac39cded30d6e94618bda086f7ce (diff) |
[POWERPC] i8259: Add disable method
Since commit 76d2160147f43f982dfe881404cfde9fd0a9da21, the NE2000 card
is not working anymore on PPC and POWERPC and produces WATCHDOG
timeouts.
The patch below fixes that the same way it has been done on x86, x86_64
and MIPS.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/i8259.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/i8259.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 7c1b27ac7d3c..216c0f5680d2 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c | |||
@@ -137,6 +137,7 @@ static void i8259_unmask_irq(unsigned int irq_nr) | |||
137 | static struct irq_chip i8259_pic = { | 137 | static struct irq_chip i8259_pic = { |
138 | .typename = " i8259 ", | 138 | .typename = " i8259 ", |
139 | .mask = i8259_mask_irq, | 139 | .mask = i8259_mask_irq, |
140 | .disable = i8259_mask_irq, | ||
140 | .unmask = i8259_unmask_irq, | 141 | .unmask = i8259_unmask_irq, |
141 | .mask_ack = i8259_mask_and_ack_irq, | 142 | .mask_ack = i8259_mask_and_ack_irq, |
142 | }; | 143 | }; |
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c index 1e5a00a4b5f5..559f27c6aefe 100644 --- a/arch/ppc/syslib/i8259.c +++ b/arch/ppc/syslib/i8259.c | |||
@@ -127,6 +127,7 @@ static void i8259_unmask_irq(unsigned int irq_nr) | |||
127 | static struct irq_chip i8259_pic = { | 127 | static struct irq_chip i8259_pic = { |
128 | .typename = " i8259 ", | 128 | .typename = " i8259 ", |
129 | .mask = i8259_mask_irq, | 129 | .mask = i8259_mask_irq, |
130 | .disable = i8259_mask_irq, | ||
130 | .unmask = i8259_unmask_irq, | 131 | .unmask = i8259_unmask_irq, |
131 | .mask_ack = i8259_mask_and_ack_irq, | 132 | .mask_ack = i8259_mask_and_ack_irq, |
132 | }; | 133 | }; |