diff options
author | Len Brown <lenb@kernel.org> | 2007-01-26 00:38:53 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-02-05 17:07:50 -0500 |
commit | 06f87adff12e52429390b22c57443665b073cd82 (patch) | |
tree | 974f0902405f35f85ed154280e8b89b29d574457 /arch | |
parent | c2c77fe8df3e0322a613ba1540910632ad14d96d (diff) |
[IA64] fix ACPI Kconfig issues
All IA64 systems except IA64_HP_SIM include ACPI and PCI.
So prevent IA64 Kconfigs that try to do irritating things like building
PCI without building ACPI.
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index fcacfe291b9b..4b35c93eca2f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -11,6 +11,8 @@ menu "Processor type and features" | |||
11 | 11 | ||
12 | config IA64 | 12 | config IA64 |
13 | bool | 13 | bool |
14 | select PCI if (!IA64_HP_SIM) | ||
15 | select ACPI if (!IA64_HP_SIM) | ||
14 | default y | 16 | default y |
15 | help | 17 | help |
16 | The Itanium Processor Family is Intel's 64-bit successor to | 18 | The Itanium Processor Family is Intel's 64-bit successor to |
@@ -84,8 +86,6 @@ choice | |||
84 | 86 | ||
85 | config IA64_GENERIC | 87 | config IA64_GENERIC |
86 | bool "generic" | 88 | bool "generic" |
87 | select ACPI | ||
88 | select PCI | ||
89 | select NUMA | 89 | select NUMA |
90 | select ACPI_NUMA | 90 | select ACPI_NUMA |
91 | help | 91 | help |