summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-02-16 22:15:37 -0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-27 10:14:40 +0100
commit48d795616c73935fd72d30ae63ff8b3f2d6bfaa7 (patch)
treedd6ff99b53463ebe990c8e2eca9e0720dffd3738 /arch/arm/plat-mxc
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d (diff)
downloadblackbird-op-linux-48d795616c73935fd72d30ae63ff8b3f2d6bfaa7.tar.gz
blackbird-op-linux-48d795616c73935fd72d30ae63ff8b3f2d6bfaa7.zip
ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's
As we are able to build a single kernel that can run on mx21 and mx27, there is no need for the ifdef's anymore inside audmux-v1.c. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/audmux-v1.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c
index 1180bef7664b..14a3c0486750 100644
--- a/arch/arm/plat-mxc/audmux-v1.c
+++ b/arch/arm/plat-mxc/audmux-v1.c
@@ -46,16 +46,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);
static int mxc_audmux_v1_init(void)
{
-#ifdef CONFIG_MACH_MX21
if (cpu_is_mx21())
audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
else
-#endif
-#ifdef CONFIG_MACH_MX27
+
if (cpu_is_mx27())
audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR);
else
-#endif
(void)0;
return 0;
OpenPOWER on IntegriCloud