aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.26
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-07-11 15:15:23 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-07-11 15:15:23 +0000
commit59d37b2472eb14e16e838f5d51c36f9da0fff455 (patch)
tree7964b9ad5ee80185356c7baf9400ef27223161f3 /target/linux/generic-2.6/patches-2.6.26
parent065091e0152a13dab298f115973aebdf589d724f (diff)
downloadupstream-59d37b2472eb14e16e838f5d51c36f9da0fff455.tar.gz
upstream-59d37b2472eb14e16e838f5d51c36f9da0fff455.tar.bz2
upstream-59d37b2472eb14e16e838f5d51c36f9da0fff455.zip
upgrade ixp4xx to 2.6.26-rc9, resync patches
SVN-Revision: 11768
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
index 1dfd95e82b..6d97dc356e 100644
--- a/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
@@ -40,7 +40,7 @@
enum
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -139,6 +139,37 @@
+@@ -128,6 +128,37 @@
To compile this code as a module, choose M here: the
module will be called sch_sfq.
diff --git a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
index e52f11a294..f1c1580e0d 100644
--- a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
@@ -50,7 +50,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -609,6 +609,7 @@
+@@ -613,6 +613,7 @@
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */