aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.24
diff options
context:
space:
mode:
authorMatteo Croce <matteo@openwrt.org>2008-02-08 17:17:45 +0000
committerMatteo Croce <matteo@openwrt.org>2008-02-08 17:17:45 +0000
commitd6c38f2f4715edbd376cf331986740e2476c204b (patch)
treea81970ce11f29f76bcba99733674f4804a9119ec /target/linux/ar7/patches-2.6.24
parent386ed5f1b17d81d54056884131ae47d628fd3099 (diff)
downloadupstream-d6c38f2f4715edbd376cf331986740e2476c204b.tar.gz
upstream-d6c38f2f4715edbd376cf331986740e2476c204b.tar.bz2
upstream-d6c38f2f4715edbd376cf331986740e2476c204b.zip
[AR7] Update kernel to 2.6.24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10421 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.24')
-rw-r--r--target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch b/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
index 4957d85a6d..7c51517b1e 100644
--- a/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
+++ b/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
@@ -1,19 +1,16 @@
---- linux-2.6.24/drivers/net/Kconfig 2008-02-07 02:29:04.000000000 +0100
-+++ linux-2.6.24/drivers/net/Kconfig 2008-02-07 02:29:35.000000000 +0100
-@@ -1830,10 +1830,8 @@
-
- config CPMAC
+--- linux-2.6.24/drivers/net/Kconfig 2008-01-25 02:20:37.000000000 +0100
++++ linux-2.6.24/drivers/net/Kconfig 2008-02-08 18:12:02.000000000 +0100
+@@ -1709,8 +1709,6 @@
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-- depends on NET_ETHERNET && EXPERIMENTAL && AR7
-+ depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
+ depends on NET_ETHERNET && EXPERIMENTAL && AR7
select PHYLIB
- select FIXED_PHY
- select FIXED_MII_100_FDX
help
TI AR7 CPMAC Ethernet support
---- linux-2.6.24/drivers/net/cpmac.c 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/net/cpmac.c 2008-02-07 02:32:57.000000000 +0100
+--- linux-2.6.24/drivers/net/cpmac.c 2008-01-25 02:20:37.000000000 +0100
++++ linux-2.6.24/drivers/net/cpmac.c 2008-02-08 18:05:35.000000000 +0100
@@ -661,9 +661,6 @@
int queue;
u32 status;