diff --git a/[refs] b/[refs]
index 9618196238f7..d81b526575e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe35a59e16fbd426194d5d081d59aa18752d1f4d
+refs/heads/master: 91e623deccd5726ff97f1da6ac48dcc26048034a
diff --git a/trunk/drivers/staging/olpc_dcon/Kconfig b/trunk/drivers/staging/olpc_dcon/Kconfig
index b05306766870..fe40e0b6f675 100644
--- a/trunk/drivers/staging/olpc_dcon/Kconfig
+++ b/trunk/drivers/staging/olpc_dcon/Kconfig
@@ -2,6 +2,7 @@ config FB_OLPC_DCON
 	tristate "One Laptop Per Child Display CONtroller support"
 	depends on OLPC && FB
 	select I2C
+	select BACKLIGHT_CLASS_DEVICE
 	---help---
 	  Add support for the OLPC XO DCON controller.  This controller is
 	  only available on OLPC platforms.   Unless you have one of these