Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / arch / arm / plat-mxc / Kconfig

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index dcebb1230f7fd3cd6f6e492c97507a483dcef3b8..c722f9ce691827e8924674119b75708ba7ea6428 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -88,12 +88,6 @@ config IMX_HAVE_IOMUX_V1
 config ARCH_MXC_IOMUX_V3
        bool
 
-config ARCH_MXC_AUDMUX_V1
-       bool
-
-config ARCH_MXC_AUDMUX_V2
-       bool
-
 config IRAM_ALLOC
        bool
        select GENERIC_ALLOCATOR