diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-11 17:35:01 (GMT) |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 20:54:34 (GMT) |
| commit | 972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch) | |
| tree | e62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/gpio.c | |
| parent | 36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff) | |
| download | linux-fsl-qoriq-972cc48207450ce6aeed416ac176fe4d0482a4a3.tar.xz | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index e59fb97..c853bfa 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c @@ -395,7 +395,7 @@ DEFINE_REGISTER_FUNCTION(imx21) #endif /* if defined(CONFIG_SOC_IMX21) */ -#if defined(CONFIG_ARCH_MX25) +#if defined(CONFIG_SOC_IMX25) static struct mxc_gpio_port imx25_gpio_ports[] = { DEFINE_IMX_GPIO_PORT_IRQ(MX25, 0, 1, MX25_INT_GPIO1), DEFINE_IMX_GPIO_PORT_IRQ(MX25, 1, 2, MX25_INT_GPIO2), @@ -405,7 +405,7 @@ static struct mxc_gpio_port imx25_gpio_ports[] = { DEFINE_REGISTER_FUNCTION(imx25) -#endif /* if defined(CONFIG_ARCH_MX25) */ +#endif /* if defined(CONFIG_SOC_IMX25) */ #if defined(CONFIG_SOC_IMX27) static struct mxc_gpio_port imx27_gpio_ports[] = { |