diff --git a/[refs] b/[refs]
index 2710d4a90b6d..b1c4b8350def 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fbb004aba15bbca64c3fb611113295bda7ee9ea
+refs/heads/master: cea196bb2eb918c30f97a2b752bcec929d761f64
diff --git a/trunk/arch/ia64/hp/sim/Kconfig b/trunk/arch/ia64/hp/sim/Kconfig
index 18ccb1266e18..f92306bbedb8 100644
--- a/trunk/arch/ia64/hp/sim/Kconfig
+++ b/trunk/arch/ia64/hp/sim/Kconfig
@@ -13,8 +13,8 @@ config HP_SIMSERIAL_CONSOLE
 	depends on HP_SIMSERIAL
 
 config HP_SIMSCSI
-	tristate "Simulated SCSI disk"
-	depends on SCSI
+	bool "Simulated SCSI disk"
+	depends on SCSI=y
 
 endmenu