diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 09:30:51 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-05 19:02:51 -0500 |
| commit | 2405fc9728a3ed7dffc36bee68f0c36e4488212d (patch) | |
| tree | 60f0a574896868e087d4edf6f22f326c9aa0d52f /arch/arm/plat-mxc/Kconfig | |
| parent | 17ec38a8b6d95100a585ed66ccc7bada13e09d0d (diff) | |
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/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index dcebb1230f7..0461d16e5ca 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
| @@ -88,10 +88,7 @@ config IMX_HAVE_IOMUX_V1 | |||
| 88 | config ARCH_MXC_IOMUX_V3 | 88 | config ARCH_MXC_IOMUX_V3 |
| 89 | bool | 89 | bool |
| 90 | 90 | ||
| 91 | config ARCH_MXC_AUDMUX_V1 | 91 | config ARCH_MXC_AUDMUX |
| 92 | bool | ||
| 93 | |||
| 94 | config ARCH_MXC_AUDMUX_V2 | ||
| 95 | bool | 92 | bool |
| 96 | 93 | ||
| 97 | config IRAM_ALLOC | 94 | config IRAM_ALLOC |