diff options
author | Fabio Estevam <festevam@gmail.com> | 2012-02-16 19:15:37 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-27 04:14:40 -0500 |
commit | 48d795616c73935fd72d30ae63ff8b3f2d6bfaa7 (patch) | |
tree | dd6ff99b53463ebe990c8e2eca9e0720dffd3738 /arch/arm/plat-mxc | |
parent | d65b4e98d7ea3038b767b70fe8be959b2913f16d (diff) |
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.c | 5 |
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 1180bef7664..14a3c048675 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); | |||
46 | 46 | ||
47 | static int mxc_audmux_v1_init(void) | 47 | static int mxc_audmux_v1_init(void) |
48 | { | 48 | { |
49 | #ifdef CONFIG_MACH_MX21 | ||
50 | if (cpu_is_mx21()) | 49 | if (cpu_is_mx21()) |
51 | audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR); | 50 | audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR); |
52 | else | 51 | else |
53 | #endif | 52 | |
54 | #ifdef CONFIG_MACH_MX27 | ||
55 | if (cpu_is_mx27()) | 53 | if (cpu_is_mx27()) |
56 | audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR); | 54 | audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR); |
57 | else | 55 | else |
58 | #endif | ||
59 | (void)0; | 56 | (void)0; |
60 | 57 | ||
61 | return 0; | 58 | return 0; |