1 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 9db35a7fcfc0..a4dd1c347050 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -233,7 +233,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         /* FIXME: Shared IRQs on COM1-COM4 will not work properly on v1i1 hardware. */
         { /* COM1 */
                 .mapbase        = 0x10000000,
-                .irq            = gpio_to_irq(ZEUS_UARTA_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTA_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -242,7 +242,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM2 */
                 .mapbase        = 0x10800000,
-                .irq            = gpio_to_irq(ZEUS_UARTB_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTB_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -251,7 +251,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM3 */
                 .mapbase        = 0x11000000,
-                .irq            = gpio_to_irq(ZEUS_UARTC_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTC_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -260,7 +260,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM4 */
                 .mapbase        = 0x11800000,
-                .irq            = gpio_to_irq(ZEUS_UARTD_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTD_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -321,8 +321,8 @@ static struct resource zeus_dm9k0_resource[] = {
                 .flags = IORESOURCE_MEM
         },
         [2] = {
-                .start = gpio_to_irq(ZEUS_ETH0_GPIO),
-                .end   = gpio_to_irq(ZEUS_ETH0_GPIO),
+                .start = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         },
 };
@@ -339,8 +339,8 @@ static struct resource zeus_dm9k1_resource[] = {
                 .flags = IORESOURCE_MEM,
         },
         [2] = {
-                .start = gpio_to_irq(ZEUS_ETH1_GPIO),
-                .end   = gpio_to_irq(ZEUS_ETH1_GPIO),
+                .start = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         },
 };
@@ -423,7 +423,7 @@ static struct spi_board_info zeus_spi_board_info[] = {
         [0] = {
                 .modalias       = "mcp2515",
                 .platform_data  = &zeus_mcp2515_pdata,
-                .irq            = gpio_to_irq(ZEUS_CAN_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_CAN_GPIO),
                 .max_speed_hz   = 1*1000*1000,
                 .bus_num        = 3,
                 .mode           = SPI_MODE_0,
@@ -753,7 +753,7 @@ static struct i2c_board_info __initdata zeus_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("pca9535",       0x20),
                 .platform_data  = &zeus_pca953x_pdata[2],
-                .irq            = gpio_to_irq(ZEUS_EXTGPIO_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_EXTGPIO_GPIO),
         },
         { I2C_BOARD_INFO("lm75a",       0x48) },
         { I2C_BOARD_INFO("24c01",       0x50) },