diff options
| author | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-08 17:17:45 +0000 |
|---|---|---|
| committer | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-08 17:17:45 +0000 |
| commit | b5a8de15ed039f2852c9f6948489bdcfd3e07afc (patch) | |
| tree | a81970ce11f29f76bcba99733674f4804a9119ec /target/linux/ar7/patches-2.6.24 | |
| parent | 6517ef0aa142c345e1575341f05e72f0660710de (diff) | |
[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.patch | 15 |
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 4957d85a6..7c51517b1 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; |