aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/gpio.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-11 12:35:01 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 15:54:34 -0500
commit972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch)
treee62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/gpio.c
parent36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff)
ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC
Some usages of ARCH_MX25 are assuming that if it is defined the other SoCs are undefined. Use SOC_IMX25 for the save places. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/gpio.c')
-rw-r--r--arch/arm/plat-mxc/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index e59fb973a771..c853bfa3dc53 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -395,7 +395,7 @@ DEFINE_REGISTER_FUNCTION(imx21)
395 395
396#endif /* if defined(CONFIG_SOC_IMX21) */ 396#endif /* if defined(CONFIG_SOC_IMX21) */
397 397
398#if defined(CONFIG_ARCH_MX25) 398#if defined(CONFIG_SOC_IMX25)
399static struct mxc_gpio_port imx25_gpio_ports[] = { 399static struct mxc_gpio_port imx25_gpio_ports[] = {
400 DEFINE_IMX_GPIO_PORT_IRQ(MX25, 0, 1, MX25_INT_GPIO1), 400 DEFINE_IMX_GPIO_PORT_IRQ(MX25, 0, 1, MX25_INT_GPIO1),
401 DEFINE_IMX_GPIO_PORT_IRQ(MX25, 1, 2, MX25_INT_GPIO2), 401 DEFINE_IMX_GPIO_PORT_IRQ(MX25, 1, 2, MX25_INT_GPIO2),
@@ -405,7 +405,7 @@ static struct mxc_gpio_port imx25_gpio_ports[] = {
405 405
406DEFINE_REGISTER_FUNCTION(imx25) 406DEFINE_REGISTER_FUNCTION(imx25)
407 407
408#endif /* if defined(CONFIG_ARCH_MX25) */ 408#endif /* if defined(CONFIG_SOC_IMX25) */
409 409
410#if defined(CONFIG_SOC_IMX27) 410#if defined(CONFIG_SOC_IMX27)
411static struct mxc_gpio_port imx27_gpio_ports[] = { 411static struct mxc_gpio_port imx27_gpio_ports[] = {