diff --git a/[refs] b/[refs]
index 6562462b8a50..2086e1fe8937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e2af544d4fe1a74006a68c744fbdaea13f1665
+refs/heads/master: 251211c3fa0d218e90f1fb4ce3b475213df467d2
diff --git a/trunk/drivers/staging/dream/Kconfig b/trunk/drivers/staging/dream/Kconfig
index 4afa081c870c..707cc71a8a6a 100644
--- a/trunk/drivers/staging/dream/Kconfig
+++ b/trunk/drivers/staging/dream/Kconfig
@@ -1,16 +1,14 @@
 config DREAM
-       tristate "HTC Dream support"
-       depends on BROKEN
+	tristate "HTC Dream support"
+	depends on MACH_TROUT
 
+if DREAM
 source "drivers/staging/dream/smd/Kconfig"
 
 source "drivers/staging/dream/camera/Kconfig"
 
-
 config INPUT_GPIO
 	tristate "GPIO driver support"
 	help
 	  Say Y here if you want to support gpio based keys, wheels etc...
-
-
-
+endif