diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/Kconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index c84c88bbbbd7..536d13b0bea6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -11,7 +11,6 @@ config IA64 | |||
11 | select PCI if (!IA64_HP_SIM) | 11 | select PCI if (!IA64_HP_SIM) |
12 | select ACPI if (!IA64_HP_SIM) | 12 | select ACPI if (!IA64_HP_SIM) |
13 | select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI | 13 | select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI |
14 | select PM if (!IA64_HP_SIM) | ||
15 | select HAVE_UNSTABLE_SCHED_CLOCK | 14 | select HAVE_UNSTABLE_SCHED_CLOCK |
16 | select HAVE_IDE | 15 | select HAVE_IDE |
17 | select HAVE_OPROFILE | 16 | select HAVE_OPROFILE |
@@ -233,6 +232,7 @@ config IA64_SGI_UV | |||
233 | config IA64_HP_SIM | 232 | config IA64_HP_SIM |
234 | bool "Ski-simulator" | 233 | bool "Ski-simulator" |
235 | select SWIOTLB | 234 | select SWIOTLB |
235 | depends on !PM_RUNTIME | ||
236 | 236 | ||
237 | endchoice | 237 | endchoice |
238 | 238 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 244fb4c81e25..a1403470f80e 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -222,7 +222,6 @@ config CPU_SHX3 | |||
222 | config ARCH_SHMOBILE | 222 | config ARCH_SHMOBILE |
223 | bool | 223 | bool |
224 | select ARCH_SUSPEND_POSSIBLE | 224 | select ARCH_SUSPEND_POSSIBLE |
225 | select PM | ||
226 | select PM_RUNTIME | 225 | select PM_RUNTIME |
227 | 226 | ||
228 | config CPU_HAS_PMU | 227 | config CPU_HAS_PMU |