diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 11:59:16 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 12:04:16 +0000 |
| commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
| tree | 588b44b4b8929caf812d440ec371331658fd7da3 /arch/arm/plat-omap/gpio.c | |
| parent | [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system (diff) | |
| parent | ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2 (diff) | |
| download | linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.tar.xz linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.zip | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 4f2fd5591337..b8c01de208b4 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -974,10 +974,11 @@ static struct irq_chip gpio_irq_chip = { }; static struct irq_chip mpuio_irq_chip = { - .name = "MPUIO", - .ack = mpuio_ack_irq, - .mask = mpuio_mask_irq, - .unmask = mpuio_unmask_irq + .name = "MPUIO", + .ack = mpuio_ack_irq, + .mask = mpuio_mask_irq, + .unmask = mpuio_unmask_irq, + .set_type = gpio_irq_type, }; static int initialized; |