diff --git a/[refs] b/[refs]
index 87f62da9d0cf..aad0d52cafbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4df25c69c946d3879581d6fbe8a34c5bb4932c1d
+refs/heads/master: 36207d1167c76b9b3d986cdb36bd3468a367cafb
diff --git a/trunk/drivers/staging/gma500/psb_bl.c b/trunk/drivers/staging/gma500/psb_bl.c
index 57b9a5e5e7b3..5dffc71c5125 100644
--- a/trunk/drivers/staging/gma500/psb_bl.c
+++ b/trunk/drivers/staging/gma500/psb_bl.c
@@ -194,6 +194,7 @@ int psb_backlight_init(struct drm_device *dev)
 	struct backlight_properties props;
 	memset(&props, 0, sizeof(struct backlight_properties));
 	props.max_brightness = 100;
+	props.type = BACKLIGHT_PLATFORM;
 
 	psb_backlight_device = backlight_device_register("psb-bl", NULL,
 						(void *)dev, &psb_ops, &props);