summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:00:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:00:53 -0700
commit1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch)
treee0e7dff35e3f38b9e360e702903e132c991f3f22 /arch/arm/mach-ixp2000
parentdc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff)
parentbafa49cc1b800df4748b29e2b038ff029d7c8747 (diff)
downloadlinux-1077682b2f97cee76a79cf38bab3fa022a97d9f8.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp2000')
-rw-r--r--arch/arm/mach-ixp2000/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 781d10ae00b7..098c817a7fb8 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -382,7 +382,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
static struct irqchip ixp2000_GPIO_irq_chip = {
.ack = ixp2000_GPIO_irq_mask_ack,
.mask = ixp2000_GPIO_irq_mask,
- .unmask = ixp2000_GPIO_irq_unmask
+ .unmask = ixp2000_GPIO_irq_unmask,
.set_type = ixp2000_GPIO_irq_type,
};