diff options
| author | Haojian Zhuang | 2011-10-10 08:21:08 +0200 |
|---|---|---|
| committer | Haojian Zhuang | 2011-11-14 14:07:58 +0100 |
| commit | 6384fdadb48a875bcc1c0f58933275f15f409b76 (patch) | |
| tree | d9416a0d9e3d9654939aa85fc515f7336dec5893 /arch/arm/mach-pxa/cm-x2xx.c | |
| parent | Revert "hvc_console: display printk messages on console." (diff) | |
| download | kernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.gz kernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.tar.xz kernel-qcow2-linux-6384fdadb48a875bcc1c0f58933275f15f409b76.zip | |
ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ
Avoid potential naming confliction since multiple architecture will be built
in a single kernel.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index f2e4190080cb..9344a0e3ba8a 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -58,8 +58,8 @@ extern void cmx270_init(void); #define CMX255_GPIO_IT8152_IRQ (0) #define CMX270_GPIO_IT8152_IRQ (22) -#define CMX255_ETHIRQ IRQ_GPIO(GPIO22_ETHIRQ) -#define CMX270_ETHIRQ IRQ_GPIO(GPIO10_ETHIRQ) +#define CMX255_ETHIRQ PXA_GPIO_TO_IRQ(GPIO22_ETHIRQ) +#define CMX270_ETHIRQ PXA_GPIO_TO_IRQ(GPIO10_ETHIRQ) #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) static struct resource cmx255_dm9000_resource[] = { |