diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 11:56:12 +0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/arm/mach-lh7a40x/arch-kev7a400.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
download | linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz |
Merge branch 'master' into upstream-fixes
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 4f2ab48800a5..15fbcc911fe7 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c @@ -71,14 +71,13 @@ static struct irq_chip kev7a400_cpld_chip = { }; -static void kev7a400_cpld_handler (unsigned int irq, struct irqdesc *desc, - struct pt_regs *regs) +static void kev7a400_cpld_handler (unsigned int irq, struct irqdesc *desc) { u32 mask = CPLD_LATCHED_INTS; irq = IRQ_KEV7A400_CPLD; for (; mask; mask >>= 1, ++irq) { if (mask & 1) - desc[irq].handle (irq, desc, regs); + desc[irq].handle (irq, desc); } } |