diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:26:57 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:26:57 +0000 |
| commit | d92c9d5b38cd2932de463df1afa7a67fbf9207ef (patch) | |
| tree | eba58d615061927cb10ba5ab8ca3e68e8a01cf7f /arch/arm/mach-imx/Kconfig | |
| parent | 4f778f56ee4f399439e401d45c1a76d72120a1f3 (diff) | |
| parent | 7378a62be238d4c12e7275e91a99adf6f5e8c7f0 (diff) | |
| download | linux-d92c9d5b38cd2932de463df1afa7a67fbf9207ef.tar.gz linux-d92c9d5b38cd2932de463df1afa7a67fbf9207ef.tar.bz2 linux-d92c9d5b38cd2932de463df1afa7a67fbf9207ef.zip | |
Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 13 |
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 |