aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rdc/patches-2.6.32
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-31 14:10:07 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-31 14:10:07 +0000
commitc62dbceb0e9e14ce10e3454a3c18ce384dff7b34 (patch)
tree35497ec1d154fcd802c3b2b1bf6c603895373d9e /target/linux/rdc/patches-2.6.32
parent8bea97ace334e352fcaba6e649968d1e988e1a6b (diff)
downloadupstream-c62dbceb0e9e14ce10e3454a3c18ce384dff7b34.tar.gz
upstream-c62dbceb0e9e14ce10e3454a3c18ce384dff7b34.tar.bz2
upstream-c62dbceb0e9e14ce10e3454a3c18ce384dff7b34.zip
[rdc] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22851 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc/patches-2.6.32')
-rw-r--r--target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch2
-rw-r--r--target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch2
-rw-r--r--target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
index c636f3a236..adf59a7bb8 100644
--- a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
+++ b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
@@ -1,6 +1,6 @@
--- a/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 $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
diff --git a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
index 1dc5c4b755..b3e8c94f0a 100644
--- a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
+++ b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
@@ -223,7 +223,7 @@
/* Read/set MAC address routines */
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);
netif_start_queue(dev);
diff --git a/target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch b/target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch
index fe7969eadc..7d59ab312c 100644
--- a/target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch
+++ b/target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch
@@ -59,9 +59,9 @@
+ .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+ .identity = "RDC321x WDT",
+};
++
-static void rdc321x_wdt_trigger(unsigned long unused)
-+
+/* generic helper functions */
+static void rdc321x_wdt_timer(unsigned long unused)
{