diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-10 16:03:51 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 21:07:59 +0800 |
| commit | 4929f5a8a99f64378659c5658621e45c90c2aaa9 (patch) | |
| tree | 37887d8dafda515434896c467d304c04e276889f /arch/arm/mach-pxa/cm-x270.c | |
| parent | 87c49e20579c933d531a376596875b8fd5dcb04f (diff) | |
| download | op-kernel-dev-4929f5a8a99f64378659c5658621e45c90c2aaa9.zip op-kernel-dev-4929f5a8a99f64378659c5658621e45c90c2aaa9.tar.gz | |
ARM: pxa: rename gpio_to_irq and irq_to_gpio
Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 4ebcee5..431ef56 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c @@ -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, |
