summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-20 16:05:41 +0100
committerLen Brown <len.brown@intel.com>2007-03-20 16:05:41 +0100
commit54b8c39fbd76a7341b66e49de677ea366737fce7 (patch)
tree2a355e5daa966548034fe30f71fb9d9cc70403cf /arch/ia64
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentACPI: IA64: fix %ll build warnings (diff)
downloadlinux-54b8c39fbd76a7341b66e49de677ea366737fce7.tar.xz
linux-54b8c39fbd76a7341b66e49de677ea366737fce7.zip
Pull misc-for-upstream into release branch
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d51f0f11f7f9..e19185d26554 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