ARM: imx: merge audmux-v1 and audmux-v2
authorShawn Guo <shawn.guo@linaro.org>
Mon, 5 Mar 2012 14:30:51 +0000 (22:30 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Mar 2012 00:02:51 +0000 (00:02 +0000)
commit2405fc9728a3ed7dffc36bee68f0c36e4488212d
tree60f0a574896868e087d4edf6f22f326c9aa0d52f
parent17ec38a8b6d95100a585ed66ccc7bada13e09d0d
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>
arch/arm/mach-imx/Kconfig
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/audmux-v1.c [deleted file]
arch/arm/plat-mxc/audmux.c [moved from arch/arm/plat-mxc/audmux-v2.c with 89% similarity]