From 5571c233e9818ab27a9248a9a172d0ec4704e43f Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 17 Jul 2010 17:20:23 +0000 Subject: [PATCH] refresh 2.6.32 patches SVN-Revision: 22257 --- target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch | 2 +- target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch | 2 +- target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch | 2 +- 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 adf59a7bb8..c636f3a236 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 b3e8c94f0a..1dc5c4b755 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 7d59ab312c..fe7969eadc 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) { -- 2.25.1