diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/arm/mach-pxa/irq.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/arm/mach-pxa/irq.c')
| -rw-r--r-- | arch/arm/mach-pxa/irq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index f3cac43124a5..539b596005fc 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
| @@ -133,7 +133,7 @@ static struct irqchip pxa_low_gpio_chip = { | |||
| 133 | .ack = pxa_ack_low_gpio, | 133 | .ack = pxa_ack_low_gpio, |
| 134 | .mask = pxa_mask_low_irq, | 134 | .mask = pxa_mask_low_irq, |
| 135 | .unmask = pxa_unmask_low_irq, | 135 | .unmask = pxa_unmask_low_irq, |
| 136 | .type = pxa_gpio_irq_type, | 136 | .set_type = pxa_gpio_irq_type, |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | /* | 139 | /* |
| @@ -157,7 +157,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 157 | mask >>= 2; | 157 | mask >>= 2; |
| 158 | do { | 158 | do { |
| 159 | if (mask & 1) | 159 | if (mask & 1) |
| 160 | desc->handle(irq, desc, regs); | 160 | desc_handle_irq(irq, desc, regs); |
| 161 | irq++; | 161 | irq++; |
| 162 | desc++; | 162 | desc++; |
| 163 | mask >>= 1; | 163 | mask >>= 1; |
| @@ -172,7 +172,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 172 | desc = irq_desc + irq; | 172 | desc = irq_desc + irq; |
| 173 | do { | 173 | do { |
| 174 | if (mask & 1) | 174 | if (mask & 1) |
| 175 | desc->handle(irq, desc, regs); | 175 | desc_handle_irq(irq, desc, regs); |
| 176 | irq++; | 176 | irq++; |
| 177 | desc++; | 177 | desc++; |
| 178 | mask >>= 1; | 178 | mask >>= 1; |
| @@ -187,7 +187,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 187 | desc = irq_desc + irq; | 187 | desc = irq_desc + irq; |
| 188 | do { | 188 | do { |
| 189 | if (mask & 1) | 189 | if (mask & 1) |
| 190 | desc->handle(irq, desc, regs); | 190 | desc_handle_irq(irq, desc, regs); |
| 191 | irq++; | 191 | irq++; |
| 192 | desc++; | 192 | desc++; |
| 193 | mask >>= 1; | 193 | mask >>= 1; |
| @@ -203,7 +203,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 203 | desc = irq_desc + irq; | 203 | desc = irq_desc + irq; |
| 204 | do { | 204 | do { |
| 205 | if (mask & 1) | 205 | if (mask & 1) |
| 206 | desc->handle(irq, desc, regs); | 206 | desc_handle_irq(irq, desc, regs); |
| 207 | irq++; | 207 | irq++; |
| 208 | desc++; | 208 | desc++; |
| 209 | mask >>= 1; | 209 | mask >>= 1; |
| @@ -241,7 +241,7 @@ static struct irqchip pxa_muxed_gpio_chip = { | |||
| 241 | .ack = pxa_ack_muxed_gpio, | 241 | .ack = pxa_ack_muxed_gpio, |
| 242 | .mask = pxa_mask_muxed_gpio, | 242 | .mask = pxa_mask_muxed_gpio, |
| 243 | .unmask = pxa_unmask_muxed_gpio, | 243 | .unmask = pxa_unmask_muxed_gpio, |
| 244 | .type = pxa_gpio_irq_type, | 244 | .set_type = pxa_gpio_irq_type, |
| 245 | }; | 245 | }; |
| 246 | 246 | ||
| 247 | 247 | ||