From 92bcadff2967e184a914c77b5f2e6eb978710fab Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Thu, 10 Feb 2011 17:56:38 -0800
Subject: [PATCH] --- yaml --- r: 235970 b: refs/heads/master c:
 b07b846c333708ce2b95b5cd2a86f51a74331d02 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/olpc_dcon/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ded2e5c4a94..f8bf4ace4c7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c59eef17f1cc21a984cf077ad45a8355781881b6
+refs/heads/master: b07b846c333708ce2b95b5cd2a86f51a74331d02
diff --git a/trunk/drivers/staging/olpc_dcon/Kconfig b/trunk/drivers/staging/olpc_dcon/Kconfig
index 982273cf354f..acb0a79a949a 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 && BROKEN
+	depends on OLPC
 	select I2C
 	---help---
 	  Add support for the OLPC XO DCON controller.  This controller is