diff options
author | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-20 11:05:41 -0400 |
commit | 54b8c39fbd76a7341b66e49de677ea366737fce7 (patch) | |
tree | 2a355e5daa966548034fe30f71fb9d9cc70403cf /arch | |
parent | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (diff) | |
parent | 0cd4554df0c261f7ba74786e471ccaa0e3725fb9 (diff) | |
download | linux-3.10-54b8c39fbd76a7341b66e49de677ea366737fce7.tar.gz linux-3.10-54b8c39fbd76a7341b66e49de677ea366737fce7.tar.bz2 linux-3.10-54b8c39fbd76a7341b66e49de677ea366737fce7.zip |
Pull misc-for-upstream into release branch
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 d51f0f11f7f..e19185d2655 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -13,6 +13,7 @@ config IA64 bool select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) + select PM if (!IA64_HP_SIM) default y help The Itanium Processor Family is Intel's 64-bit successor to |