linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-ixp4xx / nas100d-setup.c

diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 9a31444..a3b4c6a 100644 (file)
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
-#include <linux/leds.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -38,36 +37,6 @@ static struct platform_device nas100d_flash = {
        .resource               = &nas100d_flash_resource,
 };
 
-#ifdef CONFIG_LEDS_IXP4XX
-static struct resource nas100d_led_resources[] = {
-       {
-               .name           = "wlan",   /* green led */
-               .start          = 0,
-               .end            = 0,
-               .flags          = IXP4XX_GPIO_LOW,
-       },
-       {
-               .name           = "ready",  /* blue power led (off is flashing!) */
-               .start          = 15,
-               .end            = 15,
-               .flags          = IXP4XX_GPIO_LOW,
-       },
-       {
-               .name           = "disk",   /* yellow led */
-               .start          = 3,
-               .end            = 3,
-               .flags          = IXP4XX_GPIO_LOW,
-       },
-};
-
-static struct platform_device nas100d_leds = {
-       .name                   = "IXP4XX-GPIO-LED",
-       .id                     = -1,
-       .num_resources          = ARRAY_SIZE(nas100d_led_resources),
-       .resource               = nas100d_led_resources,
-};
-#endif
-
 static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = {
        .sda_pin                = NAS100D_SDA_PIN,
        .scl_pin                = NAS100D_SCL_PIN,
@@ -126,9 +95,7 @@ static struct platform_device nas100d_uart = {
 static struct platform_device *nas100d_devices[] __initdata = {
        &nas100d_i2c_controller,
        &nas100d_flash,
-#ifdef CONFIG_LEDS_IXP4XX
-       &nas100d_leds,
-#endif
+       &nas100d_uart,
 };
 
 static void nas100d_power_off(void)
@@ -155,12 +122,6 @@ static void __init nas100d_init(void)
 
        pm_power_off = nas100d_power_off;
 
-       /* This is only useful on a modified machine, but it is valuable
-        * to have it first in order to see debug messages, and so that
-        * it does *not* get removed if platform_add_devices fails!
-        */
-       (void)platform_device_register(&nas100d_uart);
-
        platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
 }