diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 22:43:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 22:43:02 -0400 |
| commit | 37c70d0d09747a958ec50aeb11ed1bf896da028c (patch) | |
| tree | 5f026a3cfc7e4d4b11ca8cf7c787325bfb96e4e0 /arch/ia64 | |
| parent | 7f52a3afc4c02db75b3953fcbbb980abc86873a2 (diff) | |
| parent | cddece4beccaa72dcb57d64a7f1e496b2e61a16b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: IA64: fix %ll build warnings
ACPI: IA64: fix allnoconfig build
ACPI: Only use IPI on known broken machines (AMD, Dothan/BaniasPentium M)
ACPI: ibm-acpi: allow module to load when acpi notifiers can't be set (v2)
ACPI: parse 2nd MADT by default
ACPICA: revert "acpi_serialize" changes
sony-laptop: MAINTAINERS fix entry, add L: and W:
ACPI: resolve HP nx6125 S3 immediate wakeup regression
ACPI: Add support to parse 2nd MADT
Diffstat (limited to 'arch/ia64')
| -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 |