diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/arm/mach-lh7a40x/irq-lh7a404.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-lh7a40x/irq-lh7a404.c')
| -rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a404.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c index 7059b983724f..5760f8c53e89 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a404.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c | |||
| @@ -161,13 +161,13 @@ void __init lh7a404_init_irq (void) | |||
| 161 | set_irq_chip (irq, irq < 32 | 161 | set_irq_chip (irq, irq < 32 |
| 162 | ? &lh7a404_gpio_vic1_chip | 162 | ? &lh7a404_gpio_vic1_chip |
| 163 | : &lh7a404_gpio_vic2_chip); | 163 | : &lh7a404_gpio_vic2_chip); |
| 164 | set_irq_handler (irq, do_level_IRQ); /* OK default */ | 164 | set_irq_handler (irq, handle_level_irq); /* OK default */ |
| 165 | break; | 165 | break; |
| 166 | default: | 166 | default: |
| 167 | set_irq_chip (irq, irq < 32 | 167 | set_irq_chip (irq, irq < 32 |
| 168 | ? &lh7a404_vic1_chip | 168 | ? &lh7a404_vic1_chip |
| 169 | : &lh7a404_vic2_chip); | 169 | : &lh7a404_vic2_chip); |
| 170 | set_irq_handler (irq, do_level_IRQ); | 170 | set_irq_handler (irq, handle_level_irq); |
| 171 | } | 171 | } |
| 172 | set_irq_flags (irq, IRQF_VALID); | 172 | set_irq_flags (irq, IRQF_VALID); |
| 173 | } | 173 | } |