summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-01-25 16:48:28 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-27 23:20:14 +0100
commit993e9fe1e70aedbb6e9670211f1ad56beea8373d (patch)
tree82ebb538be0aa2e6f4646aab7a8b7844f1f77af6 /kernel
parentPM / sleep: Add support for read-only sysfs attributes (diff)
downloadlinux-993e9fe1e70aedbb6e9670211f1ad56beea8373d.tar.xz
linux-993e9fe1e70aedbb6e9670211f1ad56beea8373d.zip
PM: APM_EMULATION does not depend on PM
The APM emulation code does multiple things, and some of them depend on PM_SLEEP, while the battery management does not. However, selecting the symbol like SHARPSL_PM does causes a Kconfig warning: warning: (SHARPSL_PM && PMAC_APM_EMU) selects APM_EMULATION which has unmet direct dependencies (PM && SYS_SUPPORTS_APM_EMULATION) From all I can tell, this is completely harmless, and we can simply allow APM_EMULATION to be enabled here, even if PM is not. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 02e8dfaa1ce2..68d3ebc12601 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -235,7 +235,7 @@ config PM_TRACE_RTC
config APM_EMULATION
tristate "Advanced Power Management Emulation"
- depends on PM && SYS_SUPPORTS_APM_EMULATION
+ depends on SYS_SUPPORTS_APM_EMULATION
help
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with