Revert "[PATCH] ARM: OMAP: LEDs driver support"

This reverts commit da3f63afabe21bf7bfb857a6e097e7810260a76f.

Header file got accidentally left out.

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 3c8fde399782f56b44dbe86020dc42ea11ba4cd4..f30862e7d4923997928260b757f32ab5ddcb084f 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -24,7 +24,6 @@
 #include <linux/mtd/onenand.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/leds.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -32,7 +31,6 @@
 #include <asm/mach/flash.h>
 
 #include <asm/arch/gpio.h>
-#include <asm/arch/led.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/usb.h>
 #include <asm/arch/board.h>
@@ -141,45 +139,10 @@ static struct platform_device apollon_lcd_device = {
        .id             = -1,
 };
 
-static struct omap_led_config apollon_led_config[] = {
-       {
-               .cdev   = {
-                       .name   = "apollon:led0",
-               },
-               .gpio   = LED0_GPIO13,
-       },
-       {
-               .cdev   = {
-                       .name   = "apollon:led1",
-               },
-               .gpio   = LED1_GPIO14,
-       },
-       {
-               .cdev   = {
-                       .name   = "apollon:led2",
-               },
-               .gpio   = LED2_GPIO15,
-       },
-};
-
-static struct omap_led_platform_data apollon_led_data = {
-       .nr_leds        = ARRAY_SIZE(apollon_led_config),
-       .leds           = apollon_led_config,
-};
-
-static struct platform_device apollon_led_device = {
-       .name           = "omap-led",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &apollon_led_data,
-       },
-};
-
 static struct platform_device *apollon_devices[] __initdata = {
        &apollon_onenand_device,
        &apollon_smc91x_device,
        &apollon_lcd_device,
-       &apollon_led_device,
 };
 
 static inline void __init apollon_init_smc91x(void)

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index be30bf643a5cb06100ae17f053fc572d47c3d9c7..03865e7a3c07d51fbc2ee57a7c7c51182e7f3d7e 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -70,12 +70,6 @@ config LEDS_OMAP_PWM
          This options enables support for LEDs connected to GPIO lines
          controlled by a PWM timer on OMAP CPUs.
 
-config LEDS_OMAP
-       tristate "LED Support for OMAP GPIO LEDs"
-       depends LEDS_CLASS && ARCH_OMAP
-       help
-         This option enables support for the LEDs on OMAP processors.
-
 comment "LED Triggers"
 
 config LEDS_TRIGGERS

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index cd3dc5397a81f6a984411ad53ff31213c46cc7d7..fd7313191fc5750c2a9a14068a3b9447d3b2f55e 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -11,7 +11,6 @@ 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
-obj-$(CONFIG_LEDS_OMAP)                        += leds-omap.o
 obj-$(CONFIG_LEDS_OMAP_PWM)            += leds-omap-pwm.o
 
 # LED Triggers