From: Fabio Estevam <festevam@gmail.com>
Date: Fri, 17 Feb 2012 00:15:37 +0000 (-0200)
Subject: ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's
X-Git-Tag: firefly_0821_release~3680^2~3252^2~12^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48d795616c73935fd72d30ae63ff8b3f2d6bfaa7;p=firefly-linux-kernel-4.4.55.git

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>
---

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;