From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 31 Aug 2010 14:10:07 +0000 (+0000)
Subject: refresh 2.6.32 patches
X-Git-Tag: reboot~19024
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=685d598adda292d55b6f3a9f62f1d63d1329568d;p=openwrt%2Fstaging%2Fblogic.git

refresh 2.6.32 patches

SVN-Revision: 22851
---

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 c636f3a23675..adf59a7bb89d 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 1dc5c4b7556d..b3e8c94f0ad3 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 fe7969eadc6b..7d59ab312c4c 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)
  {