diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 05:31:52 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 05:31:52 -0800 |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /drivers/leds/Makefile | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
| download | linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.bz2 | |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
Diffstat (limited to 'drivers/leds/Makefile')
| -rw-r--r-- | drivers/leds/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index b8a9723477f0..10badfc99f10 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o obj-$(CONFIG_LEDS_LM3530) += leds-lm3530.o obj-$(CONFIG_LEDS_MIKROTIK_RB532) += leds-rb532.o obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o -obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_NET5501) += leds-net5501.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o |