Upgrade rdc to 2.6.23, fix the r6040 driver printk's

[oweals/openwrt.git] / target / linux / rdc / files / arch / i386 / mach-rdc / platform.c

diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c b/target/linux/rdc/files/arch/i386/mach-rdc/platform.c
index 877287b856b48a116b1525dfd7010220cff9308f..0a607223c5846cdbe8de090fe32b8cf274d22d58 100644 (file)
--- a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c
+++ b/target/linux/rdc/files/arch/i386/mach-rdc/platform.c
@@ -29,14 +29,10 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
 #include <linux/leds.h>
-#endif
 
 #include <asm/gpio.h>
 
-#define PFX "rdc321x: "
-
 /* Flash */
 static struct resource rdc_flash_resource[] = {
        [0] = {
@@ -54,9 +50,8 @@ static struct platform_device rdc_flash_device = {
 };
 
 /* LEDS */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
 static struct gpio_led default_leds[] = {
-        { .name = "rdc:dmz", .gpio = 1, },
+        { .name = "rdc321x:dmz", .gpio = 1, },
 };
 
 static struct gpio_led_platform_data rdc321x_led_data = {
@@ -71,13 +66,6 @@ static struct platform_device rdc321x_leds = {
                .platform_data = &rdc321x_led_data,
        }
 };
-#else
-static struct platform_device rdc321x_leds = {
-       .name = "rdc321x-leds",
-       .id = -1,
-       .num_resources = 0,
-};
-#endif
 
 /* Watchdog */
 static struct platform_device rdc321x_wdt = {