diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-17 12:57:04 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-17 12:57:04 +0000 |
| commit | ad91de86f521b239a749b9ab5de7d2eb45e9fd8b (patch) | |
| tree | e74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/ar7 | |
| parent | 9ebfa7d89a9d13c38cc8f46f361dfadb87cafbb4 (diff) | |
[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')
| -rw-r--r-- | target/linux/ar7/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 1c6359933c..d5e403f8eb 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -11,7 +11,7 @@ BOARD:=ar7 BOARDNAME:=TI AR7 FEATURES:=squashfs jffs2 atm -LINUX_VERSION:=2.6.25.6 +LINUX_VERSION:=2.6.25.7 include $(INCLUDE_DIR)/target.mk 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; } |