diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:05:03 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 21:05:03 +0000 |
| commit | 235ecf4c59ebe13e065a40755d999fa9850b8179 (patch) | |
| tree | fc1048fe799b67413bb5716c1f0775f188500822 /drivers/leds/Makefile | |
| parent | fb0b82b32ce17564bc64cede50bf4a3204eecc60 (diff) | |
| parent | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (diff) | |
Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
* 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
input: serio: ams-delta: toggle keyboard power over GPIO
omapfb: lcd_ams_delta: drive control lines over GPIO
MTD: NAND: ams-delta: use GPIO instead of custom I/O
LED: drop leds-ams-delta driver
ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
ARM: OMAP1: ams-delta: register latch dependent devices later
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 1fc6875a8b2..8cab1bb96b5 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 |