diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/avr32/mach-at32ap/pio.c | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/avr32/mach-at32ap/pio.c')
| -rw-r--r-- | arch/avr32/mach-at32ap/pio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c index 37534103574e..f308e1ddc629 100644 --- a/arch/avr32/mach-at32ap/pio.c +++ b/arch/avr32/mach-at32ap/pio.c | |||
| @@ -282,7 +282,7 @@ static struct irq_chip gpio_irqchip = { | |||
| 282 | 282 | ||
| 283 | static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 283 | static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) |
| 284 | { | 284 | { |
| 285 | struct pio_device *pio = get_irq_desc_chip_data(desc); | 285 | struct pio_device *pio = irq_desc_get_chip_data(desc); |
| 286 | unsigned gpio_irq; | 286 | unsigned gpio_irq; |
| 287 | 287 | ||
| 288 | gpio_irq = (unsigned) irq_get_handler_data(irq); | 288 | gpio_irq = (unsigned) irq_get_handler_data(irq); |