Merge commit 'v2.6.27-rc6' into timers/hpet

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

diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 5fea5a132939abc1c608bec1a04940b7ae7612d6..68b4ac5b24815ec5767c98bf9f93b42cd2e6110e 100644 (file)
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -32,8 +32,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
@@ -126,23 +125,23 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type)
                return -EINVAL;
 
        switch (type) {
-       case IRQT_BOTHEDGE:
+       case IRQ_TYPE_EDGE_BOTH:
                int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL;
                irq_type = IXP23XX_IRQ_EDGE;
                break;
-       case IRQT_RISING:
+       case IRQ_TYPE_EDGE_RISING:
                int_style = IXP23XX_GPIO_STYLE_RISING_EDGE;
                irq_type = IXP23XX_IRQ_EDGE;
                break;
-       case IRQT_FALLING:
+       case IRQ_TYPE_EDGE_FALLING:
                int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE;
                irq_type = IXP23XX_IRQ_EDGE;
                break;
-       case IRQT_HIGH:
+       case IRQ_TYPE_LEVEL_HIGH:
                int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH;
                irq_type = IXP23XX_IRQ_LEVEL;
                break;
-       case IRQT_LOW:
+       case IRQ_TYPE_LEVEL_LOW:
                int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW;
                irq_type = IXP23XX_IRQ_LEVEL;
                break;