Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977d2fa6 authored Nov 13, 2014 by Kevin Hilman Committed by Rafael J. Wysocki Nov 15, 2014

PM / Runtime: Kconfig: move ia64 dependency to arch/ia64/Kconfig



The IA64_HP_SIM dependency on PM_RUNTIME should be done in the arch
Kconfig instead of in the PM core.  Move it accordingly.

NOTE: arch/ia64/Kconfig currently does a 'select PM', which since
commit 1eb208ae (PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP ||
CONFIG_PM_RUNTIME)) is effectively a noop unless PM_SLEEP or
PM_RUNTIME are set elsewhere.

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent dbcd2d72

arch/ia64/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -233,6 +233,7 @@ config IA64_SGI_UV
	config IA64_HP_SIM		config IA64_HP_SIM
	bool "Ski-simulator"		bool "Ski-simulator"
	select SWIOTLB		select SWIOTLB
			depends on !PM_RUNTIME

	endchoice		endchoice

kernel/power/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -131,7 +131,6 @@ config PM_WAKELOCKS_GC

	config PM_RUNTIME		config PM_RUNTIME
	bool "Run-time PM core functionality"		bool "Run-time PM core functionality"
	depends on !IA64_HP_SIM
	---help---		---help---
	Enable functionality allowing I/O devices to be put into energy-saving		Enable functionality allowing I/O devices to be put into energy-saving
	(low power) states at run time (or autosuspended) after a specified		(low power) states at run time (or autosuspended) after a specified