diff --git a/[refs] b/[refs]
index c225ea6aa284..79ed471590fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dbdf8861a8ad83ef194f2c3a389a7b37c6f832e
+refs/heads/master: d974e00b955ee390e02ae2f0eeb5ed921599ec07
diff --git a/trunk/drivers/video/backlight/s6e63m0.c b/trunk/drivers/video/backlight/s6e63m0.c
index 2d8328691df4..78bcdb176691 100644
--- a/trunk/drivers/video/backlight/s6e63m0.c
+++ b/trunk/drivers/video/backlight/s6e63m0.c
@@ -829,6 +829,9 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
 	struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);
 
 	s6e63m0_power(lcd, FB_BLANK_POWERDOWN);
+	device_remove_file(&spi->dev, &dev_attr_gamma_table);
+	device_remove_file(&spi->dev, &dev_attr_gamma_mode);
+	backlight_device_unregister(lcd->bd);
 	lcd_device_unregister(lcd->ld);
 	kfree(lcd);