1 files changed, 7 insertions, 9 deletions

diff --git a/arch/arm/mach-pxa/include/mach/idp.h b/arch/arm/mach-pxa/include/mach/idp.h
index 5eff96fcc944..22a96f87232b 100644
--- a/arch/arm/mach-pxa/include/mach/idp.h
+++ b/arch/arm/mach-pxa/include/mach/idp.h
@@ -131,28 +131,26 @@
 #define PCC_VS2         (1 << 1)
 #define PCC_VS1         (1 << 0)
 
-#define PCC_DETECT(x)   (GPLR(7 + (x)) & GPIO_bit(7 + (x)))
-
 /* A listing of interrupts used by external hardware devices */
 
-#define TOUCH_PANEL_IRQ                 IRQ_GPIO(5)
-#define IDE_IRQ                         IRQ_GPIO(21)
+#define TOUCH_PANEL_IRQ                 PXA_GPIO_TO_IRQ(5)
+#define IDE_IRQ                         PXA_GPIO_TO_IRQ(21)
 
 #define TOUCH_PANEL_IRQ_EDGE            IRQ_TYPE_EDGE_FALLING
 
-#define ETHERNET_IRQ                    IRQ_GPIO(4)
+#define ETHERNET_IRQ                    PXA_GPIO_TO_IRQ(4)
 #define ETHERNET_IRQ_EDGE               IRQ_TYPE_EDGE_RISING
 
 #define IDE_IRQ_EDGE                    IRQ_TYPE_EDGE_RISING
 
-#define PCMCIA_S0_CD_VALID              IRQ_GPIO(7)
+#define PCMCIA_S0_CD_VALID              PXA_GPIO_TO_IRQ(7)
 #define PCMCIA_S0_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
-#define PCMCIA_S1_CD_VALID              IRQ_GPIO(8)
+#define PCMCIA_S1_CD_VALID              PXA_GPIO_TO_IRQ(8)
 #define PCMCIA_S1_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
-#define PCMCIA_S0_RDYINT                IRQ_GPIO(19)
-#define PCMCIA_S1_RDYINT                IRQ_GPIO(22)
+#define PCMCIA_S0_RDYINT                PXA_GPIO_TO_IRQ(19)
+#define PCMCIA_S1_RDYINT                PXA_GPIO_TO_IRQ(22)
 
 
 /*