diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
| commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
| tree | 726e49653f7014bea034c59624ea23c21d6df13f /arch/arm/Kconfig | |
| parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
| download | op-kernel-dev-c2d8c259bfce056437e8dbc4b048944050f9b567.zip op-kernel-dev-c2d8c259bfce056437e8dbc4b048944050f9b567.tar.gz | |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2a262a8..1aa43c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1607,8 +1607,8 @@ config NR_CPUS default "4" config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL + bool "Support for hot-pluggable CPUs" + depends on SMP && HOTPLUG help Say Y here to experiment with turning CPUs off and on. CPUs can be controlled through /sys/devices/system/cpu. @@ -1649,8 +1649,8 @@ config HZ default 100 config THUMB2_KERNEL - bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)" - depends on CPU_V7 && !CPU_V6 && !CPU_V6K && EXPERIMENTAL + bool "Compile the kernel in Thumb-2 mode" + depends on CPU_V7 && !CPU_V6 && !CPU_V6K select AEABI select ARM_ASM_UNIFIED select ARM_UNWIND @@ -1854,6 +1854,7 @@ config XEN_DOM0 config XEN bool "Xen guest support on ARM (EXPERIMENTAL)" depends on EXPERIMENTAL && ARM && OF + depends on CPU_V7 && !CPU_V6 help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |
