diff options
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 94acc0b01dd6..3358f4da2ec9 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -70,7 +70,7 @@ | |||
70 | /* common GPIOs */ | 70 | /* common GPIOs */ |
71 | #define GPIO11_NAND_CS (11) | 71 | #define GPIO11_NAND_CS (11) |
72 | #define GPIO41_ETHIRQ (41) | 72 | #define GPIO41_ETHIRQ (41) |
73 | #define EM_X270_ETHIRQ IRQ_GPIO(GPIO41_ETHIRQ) | 73 | #define EM_X270_ETHIRQ PXA_GPIO_TO_IRQ(GPIO41_ETHIRQ) |
74 | #define GPIO115_WLAN_PWEN (115) | 74 | #define GPIO115_WLAN_PWEN (115) |
75 | #define GPIO19_WLAN_STRAP (19) | 75 | #define GPIO19_WLAN_STRAP (19) |
76 | #define GPIO9_USB_VBUS_EN (9) | 76 | #define GPIO9_USB_VBUS_EN (9) |
@@ -805,7 +805,7 @@ static struct spi_board_info em_x270_spi_devices[] __initdata = { | |||
805 | .modalias = "libertas_spi", | 805 | .modalias = "libertas_spi", |
806 | .max_speed_hz = 13000000, | 806 | .max_speed_hz = 13000000, |
807 | .bus_num = 2, | 807 | .bus_num = 2, |
808 | .irq = IRQ_GPIO(116), | 808 | .irq = PXA_GPIO_TO_IRQ(116), |
809 | .chip_select = 0, | 809 | .chip_select = 0, |
810 | .controller_data = &em_x270_libertas_chip, | 810 | .controller_data = &em_x270_libertas_chip, |
811 | .platform_data = &em_x270_libertas_pdata, | 811 | .platform_data = &em_x270_libertas_pdata, |
@@ -1203,7 +1203,7 @@ static struct da903x_platform_data em_x270_da9030_info = { | |||
1203 | 1203 | ||
1204 | static struct i2c_board_info em_x270_i2c_pmic_info = { | 1204 | static struct i2c_board_info em_x270_i2c_pmic_info = { |
1205 | I2C_BOARD_INFO("da9030", 0x49), | 1205 | I2C_BOARD_INFO("da9030", 0x49), |
1206 | .irq = IRQ_GPIO(0), | 1206 | .irq = PXA_GPIO_TO_IRQ(0), |
1207 | .platform_data = &em_x270_da9030_info, | 1207 | .platform_data = &em_x270_da9030_info, |
1208 | }; | 1208 | }; |
1209 | 1209 | ||