diff --git a/[refs] b/[refs]
index bf5af2b6655a..853d4591ad3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc626b278a05a0fe3eb9abd1733120f2f400cbcd
+refs/heads/master: 605036cf8443b9172b24954dc1fd218e2049f91b
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 33fcb205fcb7..468dbe8a6b9c 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -329,7 +329,7 @@ menu "Power management and ACPI"
 
 config PM
 	bool "Power Management support"
-	depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB
+	depends on !IA64_HP_SIM
 	default y
 	help
 	  "Power Management" means that parts of your computer are shut