From: Rafael J. Wysocki <[email protected]>
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 <[email protected]>
---
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
On Sat, Nov 29, 2014 at 2:03 AM, Rafael J. Wysocki <[email protected]> wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> 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 <[email protected]>
> ---
> arch/ia64/Kconfig | 1 -
> arch/sh/Kconfig | 1 -
For the sh part:
Acked-by: Geert Uytterhoeven <[email protected]>
Note that sh is orphaned, so you should resend your patch to Andrew Morton,
or queue it yourself.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Monday, December 01, 2014 10:21:54 AM Geert Uytterhoeven wrote:
> On Sat, Nov 29, 2014 at 2:03 AM, Rafael J. Wysocki <[email protected]> wrote:
> > From: Rafael J. Wysocki <[email protected]>
> >
> > 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 <[email protected]>
> > ---
> > arch/ia64/Kconfig | 1 -
> > arch/sh/Kconfig | 1 -
>
> For the sh part:
>
> Acked-by: Geert Uytterhoeven <[email protected]>
Thanks!
> Note that sh is orphaned, so you should resend your patch to Andrew Morton,
> or queue it yourself.
Since it depends on material already in my tree, I'm going to queue it up myself.
Rafael
"Rafael J. Wysocki" <[email protected]> writes:
> From: Rafael J. Wysocki <[email protected]>
>
> 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 <[email protected]>
Reviewed-by: Kevin Hilman <[email protected]>