From 591bfffa4c9c02bf15bab11862149c09a6bda78b Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 12 Oct 2007 11:21:59 +0000 Subject: Upgrade rdc to 2.6.23, fix the r6040 driver printk's git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9267 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/rdc/files/arch/i386/mach-rdc/platform.c | 14 +------------- target/linux/rdc/files/drivers/net/r6040.c | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'target/linux/rdc/files') 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 877287b85..0a607223c 100644 --- 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 #include #include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) #include -#endif #include -#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 = { diff --git a/target/linux/rdc/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c index 38d80c713..e2044c9ad 100644 --- a/target/linux/rdc/files/drivers/net/r6040.c +++ b/target/linux/rdc/files/drivers/net/r6040.c @@ -229,7 +229,7 @@ static int __devinit r6040_init_one (struct pci_dev *pdev, RDC_DBUG("r6040_init_one()", 0); if (printed_version++) - printk(KERN_INFO version); + printk(KERN_INFO "%s\n", version); err = pci_enable_device(pdev); if (err) @@ -1021,7 +1021,7 @@ static int __init r6040_init (void) { RDC_DBUG("r6040_init()", 0); - printk(KERN_INFO version); + printk(KERN_INFO "%s\n", version); printed_version = 1; if (parent != NULL) { -- cgit v1.2.3