Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / gpio-switch.c

diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 7a61d0e185a9e7d5ec22615f1a025e6832630762..7c94fc3c080bd3eb854d30ad9c8e0d1505e85e56 100644 (file)
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -191,9 +191,9 @@ static irqreturn_t gpio_sw_irq_handler(int irq, void *arg)
 
        if (!sw->both_edges) {
                if (omap_get_gpio_datain(sw->gpio))
-                       set_irq_type(OMAP_GPIO_IRQ(sw->gpio), IRQT_FALLING);
+                       set_irq_type(OMAP_GPIO_IRQ(sw->gpio), IRQ_TYPE_EDGE_FALLING);
                else
-                       set_irq_type(OMAP_GPIO_IRQ(sw->gpio), IRQT_RISING);
+                       set_irq_type(OMAP_GPIO_IRQ(sw->gpio), IRQ_TYPE_EDGE_RISING);
        }
 
        state = gpio_sw_get_state(sw);