diff options
author | Colin Cross <ccross@android.com> | 2011-03-03 14:17:49 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-03-03 14:17:49 -0800 |
commit | c871fe663a6368fd0e98f5a3bfd81b0b9c591266 (patch) | |
tree | d09c244e94c09f985caf259c434c7eda8ff53229 /arch/arm/mm/Kconfig | |
parent | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff) | |
parent | db811ca0f48578f9940f49f284ac81e336b264ad (diff) | |
download | kernel_samsung_smdk4412-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.zip kernel_samsung_smdk4412-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.tar.gz kernel_samsung_smdk4412-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.tar.bz2 |
Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 9d30c6f..e4509ba 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -405,7 +405,7 @@ config CPU_V6 config CPU_32v6K bool "Support ARM V6K processor extensions" if !SMP depends on CPU_V6 || CPU_V7 - default y if SMP && !(ARCH_MX3 || ARCH_OMAP2) + default y if SMP help Say Y here if your ARMv6 processor supports the 'K' extension. This enables the kernel to use some instructions not present @@ -416,7 +416,7 @@ config CPU_32v6K # ARMv7 config CPU_V7 bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX - select CPU_32v6K if !ARCH_OMAP2 + select CPU_32v6K select CPU_32v7 select CPU_ABRT_EV7 select CPU_PABRT_V7 @@ -644,7 +644,7 @@ config ARM_THUMBEE config SWP_EMULATE bool "Emulate SWP/SWPB instructions" - depends on CPU_V7 && !CPU_V6 + depends on !CPU_USE_DOMAINS && CPU_V7 && !CPU_V6 select HAVE_PROC_CPU if PROC_FS default y if SMP help |