Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp2000 / core.c

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 81cdc826720663722f574605d58cc9b99833cbd5..daf28074134b1391f716392f4effdd7934299559 100644 (file)
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -329,19 +329,19 @@ static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type)
        /*
         * Then, set the proper trigger type.
         */
-       if (type & IRQT_FALLING)
+       if (type & IRQ_TYPE_EDGE_FALLING)
                GPIO_IRQ_falling_edge |= 1 << line;
        else
                GPIO_IRQ_falling_edge &= ~(1 << line);
-       if (type & IRQT_RISING)
+       if (type & IRQ_TYPE_EDGE_RISING)
                GPIO_IRQ_rising_edge |= 1 << line;
        else
                GPIO_IRQ_rising_edge &= ~(1 << line);
-       if (type & IRQT_LOW)
+       if (type & IRQ_TYPE_LEVEL_LOW)
                GPIO_IRQ_level_low |= 1 << line;
        else
                GPIO_IRQ_level_low &= ~(1 << line);
-       if (type & IRQT_HIGH)
+       if (type & IRQ_TYPE_LEVEL_HIGH)
                GPIO_IRQ_level_high |= 1 << line;
        else
                GPIO_IRQ_level_high &= ~(1 << line);