Merge branch 'master' into upstream

[linux-2.6] / drivers / leds / Makefile

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index cb5d0ada6a8c072f7cdd4609953d0308713a239f..40f042633bf541e2cf4bf7ca9c42452a9d4b2ff5 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -6,7 +6,12 @@ obj-$(CONFIG_LEDS_TRIGGERS)            += led-triggers.o
 
 # LED Platform Drivers
 obj-$(CONFIG_LEDS_CORGI)               += leds-corgi.o
+obj-$(CONFIG_LEDS_LOCOMO)              += leds-locomo.o
 obj-$(CONFIG_LEDS_SPITZ)               += leds-spitz.o
+obj-$(CONFIG_LEDS_IXP4XX)              += leds-ixp4xx-gpio.o
+obj-$(CONFIG_LEDS_TOSA)                        += leds-tosa.o
+obj-$(CONFIG_LEDS_S3C24XX)             += leds-s3c24xx.o
 
 # LED Triggers
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)       += ledtrig-timer.o
+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)    += ledtrig-ide-disk.o