diff --git a/[refs] b/[refs] index 4fd05a3b0876..208635f8bb48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f5910ecabd3a36b9c06f73e33b673ccf150f3b4 +refs/heads/master: 35076bdfa171cd83d89fcb96568e786f0da91d9f diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 18ec9fe6deb6..366b401c1f29 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -756,7 +756,7 @@ config PHYSICAL_START config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && !X86_PC + depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER ---help--- Say Y here to experiment with turning CPUs off and on. CPUs can be controlled through /sys/devices/system/cpu.