aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.25
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
commit478b3b32f429be04c317e7aa1eb44241dd3429e1 (patch)
treee74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/ar7/patches-2.6.25
parent14b8ea6a1a5d851cf316c38d0594f33a4263e142 (diff)
downloadupstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.gz
upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.bz2
upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.zip
[kernel] upgrade to 2.6.25.7, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.25')
-rw-r--r--target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
index 16e21f84dd..7da22cd99c 100644
--- a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
@@ -1,6 +1,6 @@
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
-@@ -947,7 +947,8 @@
+@@ -936,7 +936,8 @@
int new_state = 0;
spin_lock(&priv->lock);
@@ -10,7 +10,7 @@
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -959,11 +960,11 @@
+@@ -948,11 +949,11 @@
priv->oldspeed = priv->phy->speed;
}