diff options
11 files changed, 16 insertions, 16 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 1dfd95e..6d97dc3 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 e52f11a..f1c1580 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 */ diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 1e2a52f..c922ffa 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx FEATURES:=squashfs SUBTARGETS=generic harddisk -LINUX_VERSION:=2.6.26-rc8 +LINUX_VERSION:=2.6.26-rc9 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch index 2044a20..c2b684d 100644 --- a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch +++ b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c -@@ -50,31 +50,31 @@ +@@ -51,31 +51,31 @@ static struct resource pronghorn_uart_resources [] = { { diff --git a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch index 9f309a6..76111fd 100644 --- a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch @@ -1,8 +1,8 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -83,6 +83,14 @@ - depends on MACH_PRONGHORN - default y +@@ -81,6 +81,14 @@ + config MACH_PRONGHORNMETRO + def_bool MACH_PRONGHORN +config MACH_COMPEX + bool "Compex WP18 / NP18A" diff --git a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch index 29c8639..edd68ec 100644 --- a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -91,6 +91,14 @@ +@@ -89,6 +89,14 @@ WP18 or NP18A boards. For more information on this platform, see http://openwrt.org diff --git a/target/linux/ixp4xx/patches-2.6.26/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.26/140-sidewinder_support.patch index e3f450f..fcd9d67 100644 --- a/target/linux/ixp4xx/patches-2.6.26/140-sidewinder_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/140-sidewinder_support.patch @@ -1,8 +1,8 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -83,6 +83,14 @@ - depends on MACH_PRONGHORN - default y +@@ -81,6 +81,14 @@ + config MACH_PRONGHORNMETRO + def_bool MACH_PRONGHORN +config MACH_SIDEWINDER + bool "Sidewinder" @@ -15,7 +15,7 @@ config MACH_COMPEX bool "Compex WP18 / NP18A" select PCI -@@ -181,7 +189,7 @@ +@@ -179,7 +187,7 @@ # config CPU_IXP46X bool diff --git a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch index fd1567b..9a00273 100644 --- a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch @@ -166,7 +166,7 @@ } --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -107,6 +107,14 @@ +@@ -105,6 +105,14 @@ WRT300N v2 router. For more information on this platform, see http://openwrt.org diff --git a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch index 2632f80..4072420 100644 --- a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -160,6 +160,14 @@ +@@ -158,6 +158,14 @@ PrPCM1100 Processor Mezanine Module. For more information on this platform, see <file:Documentation/arm/IXP4xx>. diff --git a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch index b63cb17..14555b4 100644 --- a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch +++ b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch @@ -15,7 +15,7 @@ config MACH_LOFT bool "Loft" depends on MACH_AVILA -@@ -210,7 +218,7 @@ +@@ -208,7 +216,7 @@ config CPU_IXP43X bool diff --git a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch index 2823027..8d2b4c7 100644 --- a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch @@ -13,7 +13,7 @@ --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -246,6 +246,11 @@ +@@ -244,6 +244,11 @@ default y depends on PCI |