summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-22 11:33:00 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-11-22 11:33:00 +0100
commit7378a62be238d4c12e7275e91a99adf6f5e8c7f0 (patch)
tree7f29d1884f4c8a11bb1f5246981fd253eaa1ed82 /arch/arm/mach-imx
parentMerge branch 'cleanups/assorted' into imx-fixes-for-arnd (diff)
parentARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' (diff)
downloadlinux-7378a62be238d4c12e7275e91a99adf6f5e8c7f0.tar.xz
linux-7378a62be238d4c12e7275e91a99adf6f5e8c7f0.zip
Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arnd
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 5f7f9c2a34ae..c44aa974e79c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
config HAVE_IMX_SRC
bool
-#
-# ARCH_MX31 and ARCH_MX35 are left for compatibility
-# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
-# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
-# more sensible) names are used: SOC_IMX31 and SOC_IMX35
config ARCH_MX1
bool
@@ -27,12 +22,6 @@ config ARCH_MX25
config MACH_MX27
bool
-config ARCH_MX31
- bool
-
-config ARCH_MX35
- bool
-
config SOC_IMX1
bool
select ARCH_MX1
@@ -72,7 +61,6 @@ config SOC_IMX31
select CPU_V6
select IMX_HAVE_PLATFORM_MXC_RNGA
select ARCH_MXC_AUDMUX_V2
- select ARCH_MX31
select MXC_AVIC
select SMP_ON_UP if SMP
@@ -82,7 +70,6 @@ config SOC_IMX35
select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2
select HAVE_EPIT
- select ARCH_MX35
select MXC_AVIC
select SMP_ON_UP if SMP