From: Len Brown <lenb@kernel.org>
Date: Fri, 26 Jan 2007 05:38:53 +0000 (-0500)
Subject: [IA64] fix ACPI Kconfig issues
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=06f87adff12e52429390b22c57443665b073cd82;p=deliverable%2Flinux.git

[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>
---

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