diff --git a/[refs] b/[refs]
index b613672f2730..54d813fac1d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd55cd3d3a8e57b6fac5966a23aca3cf6035b34c
+refs/heads/master: 6ffab0efc17f70f44810ae50fc40f934c8173f35
diff --git a/trunk/drivers/video/backlight/Kconfig b/trunk/drivers/video/backlight/Kconfig
index 1495a8136fcc..a339e7f60672 100644
--- a/trunk/drivers/video/backlight/Kconfig
+++ b/trunk/drivers/video/backlight/Kconfig
@@ -117,7 +117,6 @@ config BACKLIGHT_ATMEL_PWM
 config BACKLIGHT_CORGI
 	tristate "Generic (aka Sharp Corgi) Backlight Driver (DEPRECATED)"
 	depends on BACKLIGHT_CLASS_DEVICE
-	select CORGI_SSP_DEPRECATED
 	default n
 	help
 	  Say y to enable the generic platform backlight driver previously