diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-18 00:12:36 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-18 00:12:36 +0100 |
| commit | 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch) | |
| tree | 72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/arm/mach-pxa/cm-x270.c | |
| parent | ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems (diff) | |
| parent | arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes (diff) | |
| download | linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.tar.xz linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.zip | |
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/mach-pxa/cm-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 13518a705399..431ef56700c4 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c @@ -33,7 +33,7 @@ /* GPIO IRQ usage */ #define GPIO83_MMC_IRQ (83) -#define CMX270_MMC_IRQ IRQ_GPIO(GPIO83_MMC_IRQ) +#define CMX270_MMC_IRQ PXA_GPIO_TO_IRQ(GPIO83_MMC_IRQ) /* MMC power enable */ #define GPIO105_MMC_POWER (105) @@ -380,7 +380,7 @@ static struct spi_board_info cm_x270_spi_devices[] __initdata = { .modalias = "libertas_spi", .max_speed_hz = 13000000, .bus_num = 2, - .irq = gpio_to_irq(95), + .irq = PXA_GPIO_TO_IRQ(95), .chip_select = 0, .controller_data = &cm_x270_libertas_chip, .platform_data = &cm_x270_libertas_pdata, |