diff --git a/[refs] b/[refs]
index b43f8e940d1b..1a40a2cbfb4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2c77fe8df3e0322a613ba1540910632ad14d96d
+refs/heads/master: 06f87adff12e52429390b22c57443665b073cd82
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index fcacfe291b9b..4b35c93eca2f 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/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