diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
commit | 8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06 (patch) | |
tree | a5fd9796af13c084be5d6d5924c3c3430b1866b8 /arch/arm/mach-lh7a40x/arch-kev7a400.c | |
parent | 2444e56b0c08e6f3e3877583841a1213e3263d98 (diff) | |
parent | 4a1fd556c1f1fbd6d9d6739efec042324732b697 (diff) |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
[ARM] 5010/1: htc-pasic3: remove unused defines and includes
[ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
[ARM] fix lh7a40x/kev7a400 build
Diffstat (limited to 'arch/arm/mach-lh7a40x/arch-kev7a400.c')
-rw-r--r-- | arch/arm/mach-lh7a40x/arch-kev7a400.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c index 6d26661d99f..2ef7d0097b3 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c | |||
@@ -75,10 +75,9 @@ static void kev7a400_cpld_handler (unsigned int irq, struct irq_desc *desc) | |||
75 | { | 75 | { |
76 | u32 mask = CPLD_LATCHED_INTS; | 76 | u32 mask = CPLD_LATCHED_INTS; |
77 | irq = IRQ_KEV7A400_CPLD; | 77 | irq = IRQ_KEV7A400_CPLD; |
78 | for (; mask; mask >>= 1, ++irq) { | 78 | for (; mask; mask >>= 1, ++irq) |
79 | if (mask & 1) | 79 | if (mask & 1) |
80 | desc[irq].handle (irq, desc); | 80 | desc_handle_irq(irq, desc); |
81 | } | ||
82 | } | 81 | } |
83 | 82 | ||
84 | void __init lh7a40x_init_board_irq (void) | 83 | void __init lh7a40x_init_board_irq (void) |