]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Fixed compile
authorTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:34:51 +0000 (13:34 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:34:51 +0000 (13:34 +0300)
Fixed compile

arch/arm/mach-omap1/irq.c
arch/arm/plat-omap/gpio.c

index f311da542e13e66faeff55070e8c3145ea70fd0c..192ce6055faabb13f31c6e49c6c4b3b05b3dda9e 100644 (file)
@@ -165,10 +165,10 @@ static struct omap_irq_bank omap1610_irq_banks[] = {
 #endif
 
 static struct irqchip omap_irq_chip = {
-       .ack    = omap_mask_ack_irq,
-       .mask   = omap_mask_irq,
-       .unmask = omap_unmask_irq,
-       .wake   = omap_wake_irq,
+       .ack            = omap_mask_ack_irq,
+       .mask           = omap_mask_irq,
+       .unmask         = omap_unmask_irq,
+       .set_wake       = omap_wake_irq,
 };
 
 void __init omap_init_irq(void)
index 50f6b6a891d7a54345205180740f8cb47e5bcc63..4324ddf98993a5c8543ed3ff28eae43e830e8620 100644 (file)
@@ -879,11 +879,11 @@ static void mpuio_unmask_irq(unsigned int irq)
 }
 
 static struct irqchip gpio_irq_chip = {
-       .ack    = gpio_ack_irq,
-       .mask   = gpio_mask_irq,
-       .unmask = gpio_unmask_irq,
-       .type   = gpio_irq_type,
-       .wake   = gpio_wake_enable,
+       .ack            = gpio_ack_irq,
+       .mask           = gpio_mask_irq,
+       .unmask         = gpio_unmask_irq,
+       .set_type       = gpio_irq_type,
+       .set_wake       = gpio_wake_enable,
 };
 
 static struct irqchip mpuio_irq_chip = {