diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/arm/mach-at91rm9200/gpio.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/arm/mach-at91rm9200/gpio.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c index 0e396feec468..5ab46274e1a3 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91rm9200/gpio.c | |||
| @@ -261,7 +261,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs | |||
| 261 | void __iomem *pio; | 261 | void __iomem *pio; |
| 262 | u32 isr; | 262 | u32 isr; |
| 263 | 263 | ||
| 264 | pio = (void __force __iomem *) desc->chipdata; | 264 | pio = desc->base; |
| 265 | 265 | ||
| 266 | /* temporarily mask (level sensitive) parent IRQ */ | 266 | /* temporarily mask (level sensitive) parent IRQ */ |
| 267 | desc->chip->ack(irq); | 267 | desc->chip->ack(irq); |
| @@ -312,7 +312,7 @@ void __init at91_gpio_irq_setup(unsigned banks) | |||
| 312 | __raw_writel(~0, controller + PIO_IDR); | 312 | __raw_writel(~0, controller + PIO_IDR); |
| 313 | 313 | ||
| 314 | set_irq_data(id, (void *) pin); | 314 | set_irq_data(id, (void *) pin); |
| 315 | set_irq_chipdata(id, (void __force *) controller); | 315 | set_irq_chipdata(id, controller); |
| 316 | 316 | ||
| 317 | for (i = 0; i < 32; i++, pin++) { | 317 | for (i = 0; i < 32; i++, pin++) { |
| 318 | set_irq_chip(pin, &gpio_irqchip); | 318 | set_irq_chip(pin, &gpio_irqchip); |