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

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / idp.h

diff --git a/include/asm-arm/arch-pxa/idp.h b/include/asm-arm/arch-pxa/idp.h
index b6952534a4e16039775ee1ba60399e548c8e480c..21aa8ac35c1c30df8fe635b9c851ea447afe09ae 100644 (file)
--- a/include/asm-arm/arch-pxa/idp.h
+++ b/include/asm-arm/arch-pxa/idp.h
@@ -138,18 +138,18 @@
 #define TOUCH_PANEL_IRQ                        IRQ_GPIO(5)
 #define IDE_IRQ                                IRQ_GPIO(21)
 
-#define TOUCH_PANEL_IRQ_EDGE           IRQT_FALLING
+#define TOUCH_PANEL_IRQ_EDGE           IRQ_TYPE_EDGE_FALLING
 
 #define ETHERNET_IRQ                   IRQ_GPIO(4)
-#define ETHERNET_IRQ_EDGE              IRQT_RISING
+#define ETHERNET_IRQ_EDGE              IRQ_TYPE_EDGE_RISING
 
-#define IDE_IRQ_EDGE                   IRQT_RISING
+#define IDE_IRQ_EDGE                   IRQ_TYPE_EDGE_RISING
 
 #define PCMCIA_S0_CD_VALID             IRQ_GPIO(7)
-#define PCMCIA_S0_CD_VALID_EDGE                IRQT_BOTHEDGE
+#define PCMCIA_S0_CD_VALID_EDGE                IRQ_TYPE_EDGE_BOTH
 
 #define PCMCIA_S1_CD_VALID             IRQ_GPIO(8)
-#define PCMCIA_S1_CD_VALID_EDGE                IRQT_BOTHEDGE
+#define PCMCIA_S1_CD_VALID_EDGE                IRQ_TYPE_EDGE_BOTH
 
 #define PCMCIA_S0_RDYINT               IRQ_GPIO(19)
 #define PCMCIA_S1_RDYINT               IRQ_GPIO(22)