Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

* '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

diff --combined drivers/leds/Kconfig
index 9ca28fced2b9d4d17facfbe03922a8079d831615,5234db9d3fbf16f0a10ae6745aac34f993ccf7ad..f5d5c03676f8a0ffccf046648b9ebf55bab8b1d8
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -74,13 -74,6 +74,6 @@@ config LEDS_S3C24X
          This option enables support for LEDs connected to GPIO lines
          on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
  
- config LEDS_AMS_DELTA
-       tristate "LED Support for the Amstrad Delta (E3)"
-       depends on LEDS_CLASS
-       depends on MACH_AMS_DELTA
-       help
-         This option enables support for the LEDs on Amstrad Delta (E3).
- 
  config LEDS_NET48XX
        tristate "LED Support for Soekris net48xx series Error LED"
        depends on LEDS_CLASS
@@@ -403,13 -396,6 +396,13 @@@ config LEDS_MAX899
          This option enables support for on-chip LED drivers on
          MAXIM MAX8997 PMIC.
  
 +config LEDS_OT200
 +      tristate "LED support for the Bachmann OT200"
 +      depends on LEDS_CLASS && HAS_IOMEM
 +      help
 +        This option enables support for the LEDs on the Bachmann OT200.
 +        Say Y to enable LEDs on the Bachmann OT200.
 +
  config LEDS_TRIGGERS
        bool "LED Trigger support"
        depends on LEDS_CLASS

diff --combined drivers/leds/Makefile
index 1fc6875a8b201d02a1d59122548948955829de1d,10badfc99f102fa985ebf330f1c078d6d4f56259..8cab1bb96b5dc1f37e764c418269cea0e566f7e8
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -12,7 -12,6 +12,6 @@@ obj-$(CONFIG_LEDS_LOCOMO)             += leds-loco
  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
@@@ -28,7 -27,6 +27,7 @@@ obj-$(CONFIG_LEDS_LP5523)             += leds-lp55
  obj-$(CONFIG_LEDS_TCA6507)            += leds-tca6507.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
 +obj-$(CONFIG_LEDS_OT200)              += leds-ot200.o
  obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o
  obj-$(CONFIG_LEDS_PCA955X)            += leds-pca955x.o
  obj-$(CONFIG_LEDS_DA903X)             += leds-da903x.o