diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-27 01:37:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-27 01:37:53 +0100 |
| commit | af261127e94c286c08bba162711307863fd4e68c (patch) | |
| tree | d6dda7ab34c353a5d42653531b99fc30dd41721e /arch | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| parent | b2b49ccbdd547135c69371ed066cffa44912060a (diff) | |
Merge back earlier 'pm-runtime' material for 3.19-rc1.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index c84c88bbbbd..55bc92ca2ce 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -233,6 +233,7 @@ config IA64_SGI_UV config IA64_HP_SIM bool "Ski-simulator" select SWIOTLB + depends on !PM_RUNTIME endchoice |