summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-12-12 19:45:04 -0800
committerJohn Stultz <john.stultz@linaro.org>2011-12-12 19:45:04 -0800
commit3944998ff7b631715d14175bf1f321489b7c68da (patch)
treeaa876d7b3a079e1eadeed0cd3814dff7efb020aa
parent192e11ad30c7caa8dec0101e4642cfba4a535840 (diff)
defconfig: Re-add CONFIG_SCHED_MClinux-linaro-3.2-2011.12-0-android-1
This fell out earlier, so re-add it. Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--arch/arm/configs/android_omap4_defconfig2
-rw-r--r--arch/arm/configs/android_origen_defconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig
index e740b65f588..ad2203d0344 100644
--- a/arch/arm/configs/android_omap4_defconfig
+++ b/arch/arm/configs/android_omap4_defconfig
@@ -25,6 +25,8 @@ CONFIG_ARCH_OMAP=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
CONFIG_LEDS=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig
index dd4d88419bf..aa8588357fa 100644
--- a/arch/arm/configs/android_origen_defconfig
+++ b/arch/arm/configs/android_origen_defconfig
@@ -32,6 +32,8 @@ CONFIG_PL310_ERRATA_727915=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
CONFIG_NR_CPUS=2
CONFIG_AEABI=y
CONFIG_CMDLINE="root=/dev/mmcblk0p1 rw rootwait console=ttySAC2,115200 init=/linuxrc"