diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-11 18:35:01 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 21:54:34 +0100 |
| commit | 972cc48207450ce6aeed416ac176fe4d0482a4a3 (patch) | |
| tree | e62a038b396da09b3f3dd5bdf427eb4baa8772da /arch/arm/plat-mxc/ehci.c | |
| parent | 36a8cac9524bc67df2911cb3fbc349f87bcad37d (diff) | |
| download | op-kernel-dev-972cc48207450ce6aeed416ac176fe4d0482a4a3.zip op-kernel-dev-972cc48207450ce6aeed416ac176fe4d0482a4a3.tar.gz | |
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/ehci.c')
| -rw-r--r-- | arch/arm/plat-mxc/ehci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/ehci.c b/arch/arm/plat-mxc/ehci.c index f699235..4bac3d5 100644 --- a/arch/arm/plat-mxc/ehci.c +++ b/arch/arm/plat-mxc/ehci.c @@ -69,7 +69,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags) { unsigned int v; -#if defined(CONFIG_ARCH_MX25) +#if defined(CONFIG_SOC_IMX25) if (cpu_is_mx25()) { v = readl(MX25_IO_ADDRESS(MX25_USB_BASE_ADDR + USBCTRL_OTGBASE_OFFSET)); @@ -112,7 +112,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags) USBCTRL_OTGBASE_OFFSET)); return 0; } -#endif /* CONFIG_ARCH_MX25 */ +#endif /* if defined(CONFIG_SOC_IMX25) */ #if defined(CONFIG_ARCH_MX3) if (cpu_is_mx31()) { v = readl(MX31_IO_ADDRESS(MX31_OTG_BASE_ADDR + |
