Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index a322855dd9a8c6a664d65f43c1d96b57914e5d47..806a9d4c73111c6f9c8f445d699c55c315aea332 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -17,8 +17,10 @@ obj-$(CONFIG_LEDS_WRAP)                      += leds-wrap.o
 obj-$(CONFIG_LEDS_OMAP)                        += leds-omap.o
 obj-$(CONFIG_LEDS_OMAP_PWM)            += leds-omap-pwm.o
 obj-$(CONFIG_LEDS_H1940)               += leds-h1940.o
-obj-$(CONFIG_LEDS_COBALT)              += leds-cobalt.o
+obj-$(CONFIG_LEDS_COBALT_QUBE)         += leds-cobalt-qube.o
+obj-$(CONFIG_LEDS_COBALT_RAQ)          += leds-cobalt-raq.o
 obj-$(CONFIG_LEDS_GPIO)                        += leds-gpio.o
+obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
 
 # LED Triggers
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)       += ledtrig-timer.o