Commit dfecb253 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] VISWS: prevent APM

Prevent X86_VISWS config from building APM support.  APM isn't supported
and it won't build if attempted.  Also disable P4THERMAL for VISWS.
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Acked-by: default avatarAndrey Panin <pazke@donpac.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac7e5c71
......@@ -590,7 +590,7 @@ config X86_MCE_NONFATAL
config X86_MCE_P4THERMAL
bool "check for P4 thermal throttling interrupt."
depends on X86_MCE && (X86_UP_APIC || SMP)
depends on X86_MCE && (X86_UP_APIC || SMP) && !X86_VISWS
help
Enabling this feature will cause a message to be printed when the P4
enters thermal throttling.
......@@ -885,7 +885,7 @@ source kernel/power/Kconfig
source "drivers/acpi/Kconfig"
menu "APM (Advanced Power Management) BIOS Support"
depends on PM
depends on PM && !X86_VISWS
config APM
tristate "APM (Advanced Power Management) BIOS support"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment