diff --git a/[refs] b/[refs]
index 2ed34c0a7222..421c9bbee6f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82d4b4776d575223c14b25546e0336541ef8ba94
+refs/heads/master: a747d4b817daf95c64ac6396e27fddc66c83a811
diff --git a/trunk/drivers/staging/olpc_dcon/Kconfig b/trunk/drivers/staging/olpc_dcon/Kconfig
index cfdec44591b2..8be87166b54b 100644
--- a/trunk/drivers/staging/olpc_dcon/Kconfig
+++ b/trunk/drivers/staging/olpc_dcon/Kconfig
@@ -1,6 +1,6 @@
 config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
-	depends on OLPC
+	depends on OLPC && BROKEN
 	select I2C
 	---help---
 	  Add support for the OLPC XO DCON controller.  This controller is