From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Sat, 29 Nov 2014 00:42:35 +0000 Subject: [PATCH] PM / Kconfig: Do not select PM directly from Kconfig files Message-Id: <4088467.A4Xd3YfMSv@vostro.rjw.lan> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Linux PM list Cc: Linux Kernel Mailing List , Tony Luck , linux-sh@vger.kernel.org, Fenghua Yu , linux-ia64@vger.kernel.org, Kevin Hilman From: Rafael J. Wysocki It is not valid to select CONFIG_PM directly without selecting CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME too, because that breaks dependencies (ia64 does that) and it is not necessary to select CONFIG_PM directly if CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME is set, because it will be set automatically then (sh does that). Fix those mistakes. Signed-off-by: Rafael J. Wysocki --- arch/ia64/Kconfig | 1 - arch/sh/Kconfig | 1 - 2 files changed, 2 deletions(-) Index: linux-pm/arch/ia64/Kconfig =================================--- linux-pm.orig/arch/ia64/Kconfig +++ linux-pm/arch/ia64/Kconfig @@ -11,7 +11,6 @@ config IA64 select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI - select PM if (!IA64_HP_SIM) select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE select HAVE_OPROFILE Index: linux-pm/arch/sh/Kconfig =================================--- linux-pm.orig/arch/sh/Kconfig +++ linux-pm/arch/sh/Kconfig @@ -222,7 +222,6 @@ config CPU_SHX3 config ARCH_SHMOBILE bool select ARCH_SUSPEND_POSSIBLE - select PM select PM_RUNTIME config CPU_HAS_PMU