diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
commit | 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 (patch) | |
tree | d3057d468d36664d1accf964e76f6d97a299b40d /arch/sh/boards/mpc1211/setup.c | |
parent | a700f3594d63a85af196ac64984f7375d903afad (diff) |
sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mpc1211/setup.c')
-rw-r--r-- | arch/sh/boards/mpc1211/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c index 01c10fa5c058..7c3d1d304157 100644 --- a/arch/sh/boards/mpc1211/setup.c +++ b/arch/sh/boards/mpc1211/setup.c | |||
@@ -69,7 +69,6 @@ static void __init pci_write_config(unsigned long busNo, | |||
69 | 69 | ||
70 | static unsigned char m_irq_mask = 0xfb; | 70 | static unsigned char m_irq_mask = 0xfb; |
71 | static unsigned char s_irq_mask = 0xff; | 71 | static unsigned char s_irq_mask = 0xff; |
72 | volatile unsigned long irq_err_count; | ||
73 | 72 | ||
74 | static void disable_mpc1211_irq(unsigned int irq) | 73 | static void disable_mpc1211_irq(unsigned int irq) |
75 | { | 74 | { |
@@ -118,7 +117,7 @@ static void mask_and_ack_mpc1211(unsigned int irq) | |||
118 | if(irq < 8) { | 117 | if(irq < 8) { |
119 | if(m_irq_mask & (1<<irq)){ | 118 | if(m_irq_mask & (1<<irq)){ |
120 | if(!mpc1211_irq_real(irq)){ | 119 | if(!mpc1211_irq_real(irq)){ |
121 | irq_err_count++; | 120 | atomic_inc(&irq_err_count) |
122 | printk("spurious 8259A interrupt: IRQ %x\n",irq); | 121 | printk("spurious 8259A interrupt: IRQ %x\n",irq); |
123 | } | 122 | } |
124 | } else { | 123 | } else { |
@@ -131,7 +130,7 @@ static void mask_and_ack_mpc1211(unsigned int irq) | |||
131 | } else { | 130 | } else { |
132 | if(s_irq_mask & (1<<(irq - 8))){ | 131 | if(s_irq_mask & (1<<(irq - 8))){ |
133 | if(!mpc1211_irq_real(irq)){ | 132 | if(!mpc1211_irq_real(irq)){ |
134 | irq_err_count++; | 133 | atomic_inc(&irq_err_count); |
135 | printk("spurious 8259A interrupt: IRQ %x\n",irq); | 134 | printk("spurious 8259A interrupt: IRQ %x\n",irq); |
136 | } | 135 | } |
137 | } else { | 136 | } else { |