Merge branch 'omap1-part2' into omap1

Conflicts:
	drivers/leds/leds-ams-delta.c

3 files changed, 0 insertions, 134 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index c957c344233f..5234db9d3fbf 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -74,13 +74,6 @@ config LEDS_S3C24XX
           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
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
diff --git a/drivers/leds/leds-ams-delta.c b/drivers/leds/leds-ams-delta.c
deleted file mode 100644
index 07428357c83f..000000000000
--- a/drivers/leds/leds-ams-delta.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * LEDs driver for Amstrad Delta (E3)
- *
- * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <plat/board-ams-delta.h>
-
-/*
- * Our context
- */
-struct ams_delta_led {
-        struct led_classdev     cdev;
-        u8                      bitmask;
-};
-
-static void ams_delta_led_set(struct led_classdev *led_cdev,
-                enum led_brightness value)
-{
-        struct ams_delta_led *led_dev =
-                container_of(led_cdev, struct ams_delta_led, cdev);
-
-        if (value)
-                ams_delta_latch1_write(led_dev->bitmask, led_dev->bitmask);
-        else
-                ams_delta_latch1_write(led_dev->bitmask, 0);
-}
-
-static struct ams_delta_led ams_delta_leds[] = {
-        {
-                .cdev           = {
-                        .name           = "ams-delta::camera",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_CAMERA,
-        },
-        {
-                .cdev           = {
-                        .name           = "ams-delta::advert",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_ADVERT,
-        },
-        {
-                .cdev           = {
-                        .name           = "ams-delta::email",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_EMAIL,
-        },
-        {
-                .cdev           = {
-                        .name           = "ams-delta::handsfree",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_HANDSFREE,
-        },
-        {
-                .cdev           = {
-                        .name           = "ams-delta::voicemail",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_VOICEMAIL,
-        },
-        {
-                .cdev           = {
-                        .name           = "ams-delta::voice",
-                        .brightness_set = ams_delta_led_set,
-                },
-                .bitmask        = AMS_DELTA_LATCH1_LED_VOICE,
-        },
-};
-
-static int ams_delta_led_probe(struct platform_device *pdev)
-{
-        int i, ret;
-
-        for (i = 0; i < ARRAY_SIZE(ams_delta_leds); i++) {
-                ams_delta_leds[i].cdev.flags |= LED_CORE_SUSPENDRESUME;
-                ret = led_classdev_register(&pdev->dev,
-                                &ams_delta_leds[i].cdev);
-                if (ret < 0)
-                        goto fail;
-        }
-
-        return 0;
-fail:
-        while (--i >= 0)
-                led_classdev_unregister(&ams_delta_leds[i].cdev);
-        return ret;     
-}
-
-static int ams_delta_led_remove(struct platform_device *pdev)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(ams_delta_leds); i++)
-                led_classdev_unregister(&ams_delta_leds[i].cdev);
-
-        return 0;
-}
-
-static struct platform_driver ams_delta_led_driver = {
-        .probe          = ams_delta_led_probe,
-        .remove         = ams_delta_led_remove,
-        .driver         = {
-                .name = "ams-delta-led",
-                .owner = THIS_MODULE,
-        },
-};
-
-module_platform_driver(ams_delta_led_driver);
-
-MODULE_AUTHOR("Jonathan McDowell <noodles@earth.li>");
-MODULE_DESCRIPTION("Amstrad Delta LED driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ams-delta-led");