diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-06-28 12:45:14 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 08:48:26 -0400 |
| commit | e0246e8ecad10b9437381b89756292ac031d4cfa (patch) | |
| tree | b41e0bf972d7cd28d8382644949ebd1638e344b2 /arch/arm/mach-omap2/Kconfig | |
| parent | 0fb37842e47dd7f96725b86cb89a03dcecc72a46 (diff) | |
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
commit 164e0cbf60 (ARM: OMAP3/4: consolidate cpuidle Makefile) added
an OMAP-specific dependency from CPU_IDLE to CONFIG_PM. This causes
some randconfig warnings when CONFIG_PM has unmet dependencies:
warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)
warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)
warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)
Fix this by making the dependency on CONFIG_PM_RUNTIME (which in turn
will enable CONFIG_PM.)
Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index cf84588cd110..2f4ace6f91d1 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -35,7 +35,7 @@ config ARCH_OMAP3 | |||
| 35 | select CPU_V7 | 35 | select CPU_V7 |
| 36 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 36 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
| 37 | select ARCH_HAS_OPP | 37 | select ARCH_HAS_OPP |
| 38 | select PM if CPU_IDLE | 38 | select PM_RUNTIME if CPU_IDLE |
| 39 | select PM_OPP if PM | 39 | select PM_OPP if PM |
| 40 | select ARM_CPU_SUSPEND if PM | 40 | select ARM_CPU_SUSPEND if PM |
| 41 | select MULTI_IRQ_HANDLER | 41 | select MULTI_IRQ_HANDLER |
| @@ -53,7 +53,7 @@ config ARCH_OMAP4 | |||
| 53 | select PL310_ERRATA_727915 | 53 | select PL310_ERRATA_727915 |
| 54 | select ARM_ERRATA_720789 | 54 | select ARM_ERRATA_720789 |
| 55 | select ARCH_HAS_OPP | 55 | select ARCH_HAS_OPP |
| 56 | select PM if CPU_IDLE | 56 | select PM_RUNTIME if CPU_IDLE |
| 57 | select PM_OPP if PM | 57 | select PM_OPP if PM |
| 58 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 58 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
| 59 | select ARM_CPU_SUSPEND if PM | 59 | select ARM_CPU_SUSPEND if PM |