1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 18:14:04 +02:00

[rdc] refresh 2.6.32 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22257 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-07-17 17:20:23 +00:00
parent 7ed52767e0
commit b123f2edc5
3 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
--- a/scripts/Makefile.lib --- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib +++ b/scripts/Makefile.lib
@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) @@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@ quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \ cmd_lzma = (cat $(filter-out FORCE,$^) | \

View File

@ -223,7 +223,7 @@
/* Read/set MAC address routines */ /* Read/set MAC address routines */
static void r6040_mac_address(struct net_device *dev) static void r6040_mac_address(struct net_device *dev)
@@ -874,10 +782,6 @@ static int r6040_open(struct net_device @@ -874,10 +782,6 @@ static int r6040_open(struct net_device
napi_enable(&lp->napi); napi_enable(&lp->napi);
netif_start_queue(dev); netif_start_queue(dev);

View File

@ -59,9 +59,9 @@
+ .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, + .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+ .identity = "RDC321x WDT", + .identity = "RDC321x WDT",
+}; +};
+
-static void rdc321x_wdt_trigger(unsigned long unused) -static void rdc321x_wdt_trigger(unsigned long unused)
+
+/* generic helper functions */ +/* generic helper functions */
+static void rdc321x_wdt_timer(unsigned long unused) +static void rdc321x_wdt_timer(unsigned long unused)
{ {