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) | |
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 d51f0f11f7f9..e19185d26554 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -13,6 +13,7 @@ config IA64 | |||
| 13 | bool | 13 | bool |
| 14 | select PCI if (!IA64_HP_SIM) | 14 | select PCI if (!IA64_HP_SIM) |
| 15 | select ACPI if (!IA64_HP_SIM) | 15 | select ACPI if (!IA64_HP_SIM) |
| 16 | select PM if (!IA64_HP_SIM) | ||
| 16 | default y | 17 | default y |
| 17 | help | 18 | help |
| 18 | The Itanium Processor Family is Intel's 64-bit successor to | 19 | The Itanium Processor Family is Intel's 64-bit successor to |