diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /arch/arm/mach-at91rm9200/gpio.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/arm/mach-at91rm9200/gpio.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c index 5783c282ae7b..cec199fd6721 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91rm9200/gpio.c | |||
| @@ -327,7 +327,8 @@ static int gpio_irq_type(unsigned pin, unsigned type) | |||
| 327 | return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL; | 327 | return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | static struct irqchip gpio_irqchip = { | 330 | static struct irq_chip gpio_irqchip = { |
| 331 | .name = "GPIO", | ||
| 331 | .mask = gpio_irq_mask, | 332 | .mask = gpio_irq_mask, |
| 332 | .unmask = gpio_irq_unmask, | 333 | .unmask = gpio_irq_unmask, |
| 333 | .set_type = gpio_irq_type, | 334 | .set_type = gpio_irq_type, |