diff --git a/[refs] b/[refs] index a88b1c26a437..bdfa8c30a5e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfcd8c4fbc4c84c286d3ebae8648914016c1ea4c +refs/heads/master: 63332a9d16e7dede26d252af3f9c4304b51e7974 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index abb582bc218f..5c8a845a4129 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -938,7 +938,7 @@ source "drivers/acpi/Kconfig" menuconfig APM tristate "APM (Advanced Power Management) BIOS support" - depends on PM && !X86_VISWS + depends on PM_SLEEP && !X86_VISWS ---help--- APM is a BIOS specification for saving power using several different techniques. This is mostly useful for battery powered laptops with