diff --git a/[refs] b/[refs]
index 98e87e457193..7f6549233ba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa575b2376c26a2204f9d848e7555452888b69b
+refs/heads/master: df56eacdd5b1018f3f2831ff245a7cb70c602454
diff --git a/trunk/arch/arm/mach-pxa/magician.c b/trunk/arch/arm/mach-pxa/magician.c
index d98ef7ada2f8..b0dc18110225 100644
--- a/trunk/arch/arm/mach-pxa/magician.c
+++ b/trunk/arch/arm/mach-pxa/magician.c
@@ -135,7 +135,7 @@ static struct generic_bl_info backlight_info = {
 };
 
 static struct platform_device backlight = {
-	.name = "corgi-bl",
+	.name = "generic-bl",
 	.dev  = {
 		.platform_data = &backlight_info,
 	},