diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 22:30:51 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-06 00:02:51 +0000 |
| commit | 2405fc9728a3ed7dffc36bee68f0c36e4488212d (patch) | |
| tree | 60f0a574896868e087d4edf6f22f326c9aa0d52f /arch/arm/plat-mxc/Makefile | |
| parent | 17ec38a8b6d95100a585ed66ccc7bada13e09d0d (diff) | |
| download | op-kernel-dev-2405fc9728a3ed7dffc36bee68f0c36e4488212d.zip op-kernel-dev-2405fc9728a3ed7dffc36bee68f0c36e4488212d.tar.gz | |
ARM: imx: merge audmux-v1 and audmux-v2
It merges audmux-v1 and audmux-v2 under arch/arm/plat-mxc into one.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index 076db84f..530c81d 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -14,8 +14,7 @@ obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o obj-$(CONFIG_MXC_PWM) += pwm.o obj-$(CONFIG_MXC_ULPI) += ulpi.o obj-$(CONFIG_MXC_USE_EPIT) += epit.o -obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o -obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o +obj-$(CONFIG_ARCH_MXC_AUDMUX) += audmux.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o ifdef CONFIG_SND_IMX_SOC |
