summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <lenb@kernel.org>2007-01-26 06:38:53 +0100
committerTony Luck <tony.luck@intel.com>2007-02-05 23:07:50 +0100
commit06f87adff12e52429390b22c57443665b073cd82 (patch)
tree974f0902405f35f85ed154280e8b89b29d574457 /arch
parent[IA64] Fix NULL-pointer dereference in ia64_machine_kexec() (diff)
downloadlinux-06f87adff12e52429390b22c57443665b073cd82.tar.xz
linux-06f87adff12e52429390b22c57443665b073cd82.zip
[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/Kconfig4
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"
config IA64
bool
+ select PCI if (!IA64_HP_SIM)
+ select ACPI if (!IA64_HP_SIM)
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
@@ -84,8 +86,6 @@ choice
config IA64_GENERIC
bool "generic"
- select ACPI
- select PCI
select NUMA
select ACPI_NUMA
help