diff --git a/[refs] b/[refs] index 139bf9418861..93fff2775fd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5335c0f1bcba16907972b66b905f62402433e23 +refs/heads/master: d3f4aaa3d7b4152dac28751ee902f769d03289a1 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index bfea1bedcbf2..b008fb0cd7b7 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -737,7 +737,7 @@ config PHYSICAL_START config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER + depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && !X86_PC ---help--- Say Y here to experiment with turning CPUs off and on. CPUs can be controlled through /sys/devices/system/cpu.