diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 08:24:29 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 08:24:29 +0100 |
| commit | 2a85927c79634e89b9cd683dd2bae65966d9b216 (patch) | |
| tree | 5e922b0f26e4099b6bcad65d2d5ea42e166ff068 /arch/arm/plat-mxc/audmux-v2.c | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| parent | 124bf94a9f9b52341562628cd56b252e7d820ee8 (diff) | |
| download | op-kernel-dev-2a85927c79634e89b9cd683dd2bae65966d9b216.zip op-kernel-dev-2a85927c79634e89b9cd683dd2bae65966d9b216.tar.gz | |
Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38
Diffstat (limited to 'arch/arm/plat-mxc/audmux-v2.c')
| -rw-r--r-- | arch/arm/plat-mxc/audmux-v2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index 0be1ac7..175e364 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c @@ -209,7 +209,7 @@ static int mxc_audmux_v2_init(void) audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR); } #endif -#if defined(CONFIG_ARCH_MX25) +#if defined(CONFIG_SOC_IMX25) if (cpu_is_mx25()) { audmux_clk = clk_get(NULL, "audmux"); if (IS_ERR(audmux_clk)) { @@ -220,7 +220,7 @@ static int mxc_audmux_v2_init(void) } audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR); } -#endif +#endif /* if defined(CONFIG_SOC_IMX25) */ audmux_debugfs_init(); return 0; |
