Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / video / backlight / Makefile

diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 4af321fae3901a42c0e9b1473fb138d5ebfb696f..65e5553fc849fed5bcbadb287640313bdfa09b97 100644 (file)
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -3,4 +3,5 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)  += corgi_bl.o
-obj-$(CONFIG_SHARP_LOCOMO)     += locomolcd.o
+obj-$(CONFIG_BACKLIGHT_HP680)  += hp680_bl.o
+obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o