aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000/ixdp2x01.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:17:25 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:17:25 -0700
commit64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 (patch)
tree98658d9009182e79cb443cef67afbdc4bb3b8a48 /arch/arm/mach-ixp2000/ixdp2x01.c
parentbabf68de5848f7e4b97c9c4a2d5e30598b825387 (diff)
parent664399e1fbdceb18da9c9c5534dedd62327c63e8 (diff)
downloadkernel_samsung_smdk4412-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.tar.gz
kernel_samsung_smdk4412-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.tar.bz2
kernel_samsung_smdk4412-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x01.c')
-rw-r--r--arch/arm/mach-ixp2000/ixdp2x01.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 43447dad165..7a510992128 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -82,7 +82,7 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irqdesc *desc, struct
struct irqdesc *cpld_desc;
int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
cpld_desc = irq_desc + cpld_irq;
- cpld_desc->handle(cpld_irq, cpld_desc, regs);
+ desc_handle_irq(cpld_irq, cpld_desc, regs);
}
}