lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arnd

Browse Source
This commit is contained in:
Sascha Hauer
2011-11-22 11:33:00 +01:00
parent 9a2ee7152c e760b5260d
commit 7378a62be2
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-imx/Kconfig
View File

@@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
config HAVE_IMX_SRC config HAVE_IMX_SRC
bool 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 config ARCH_MX1
bool bool
@@ -27,12 +22,6 @@ config ARCH_MX25
config MACH_MX27 config MACH_MX27
bool bool
config ARCH_MX31
bool
config ARCH_MX35
bool
config SOC_IMX1 config SOC_IMX1
bool bool
select ARCH_MX1 select ARCH_MX1
@@ -72,7 +61,6 @@ config SOC_IMX31
select CPU_V6 select CPU_V6
select IMX_HAVE_PLATFORM_MXC_RNGA select IMX_HAVE_PLATFORM_MXC_RNGA
select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_AUDMUX_V2
select ARCH_MX31
select MXC_AVIC select MXC_AVIC
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
@@ -82,7 +70,6 @@ config SOC_IMX35
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_AUDMUX_V2
select HAVE_EPIT select HAVE_EPIT
select ARCH_MX35
select MXC_AVIC select MXC_AVIC
select SMP_ON_UP if SMP select SMP_ON_UP if SMP