diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 10:02:12 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 10:02:12 +0200 |
commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /arch/arm/plat-orion/gpio.c | |
parent | drivers/video: use strings to specify the Freescale DIU monitor port (diff) | |
parent | drivers/video/udlfb match class, subclass, and protocol (diff) | |
download | linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.xz linux-4af358f81881e1d083a916c9269b5ac0936e180d.zip |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'arch/arm/plat-orion/gpio.c')
-rw-r--r-- | arch/arm/plat-orion/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 5b4fffab1eb4..41ab97ebe4cf 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -432,7 +432,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio, ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF; ct->regs.ack = GPIO_EDGE_CAUSE_OFF; ct->type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; - ct->chip.irq_ack = irq_gc_ack; + ct->chip.irq_ack = irq_gc_ack_clr_bit; ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; ct->chip.irq_set_type = gpio_irq_set_type; |