diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-09-26 18:46:53 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-09-26 18:46:53 +0000 |
| commit | 151259743b7854bcf3ff9970a71ec26afd31a7e1 (patch) | |
| tree | 3901f728cb521f0084dd9bf77caa05470b980387 /target | |
| parent | ae64582e5ce94230efc857d8a349115b789f366e (diff) | |
[kernel] update to 2.6.26.5 and 2.6.25.17
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12718 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
43 files changed, 95 insertions, 158 deletions
diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index 5709a58cd..4eebc6fba 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk BOARD:=adm5120 BOARDNAME:=Infineon/ADMtek ADM5120 -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 SUBTARGETS:=router_le router_be INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch index 160c9adc7..0661ee1ad 100644 --- a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch +++ b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch @@ -22,7 +22,7 @@ config MACH_ALCHEMY bool "Alchemy processor based machines" -@@ -687,6 +701,7 @@ +@@ -687,6 +702,7 @@ endchoice diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 4d0723807..4cf12a9f5 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.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar7/patches-2.6.26/100-board_support.patch b/target/linux/ar7/patches-2.6.26/100-board_support.patch index 33b0b8baa..82d09b0f0 100644 --- a/target/linux/ar7/patches-2.6.26/100-board_support.patch +++ b/target/linux/ar7/patches-2.6.26/100-board_support.patch @@ -26,7 +26,7 @@ --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c -@@ -1112,9 +1112,22 @@ +@@ -1188,9 +1188,22 @@ exception_handlers[n] = handler; if (n == 0 && cpu_has_divec) { diff --git a/target/linux/ar7/patches-2.6.26/110-flash.patch b/target/linux/ar7/patches-2.6.26/110-flash.patch index 39bf83aff..4740e3421 100644 --- a/target/linux/ar7/patches-2.6.26/110-flash.patch +++ b/target/linux/ar7/patches-2.6.26/110-flash.patch @@ -1,6 +1,5 @@ -diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kconfig ---- linux-2.6.26.3.orig/drivers/mtd/Kconfig 2008-08-27 19:37:48.000000000 -0700 -+++ linux-2.6.26.3/drivers/mtd/Kconfig 2008-08-27 19:39:14.000000000 -0700 +--- a/drivers/mtd/Kconfig ++++ b/drivers/mtd/Kconfig @@ -174,6 +174,12 @@ ---help--- TI AR7 partitioning support @@ -14,9 +13,8 @@ diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kco comment "User Modules And Translation Layers" config MTD_CHAR -diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Makefile ---- linux-2.6.26.3.orig/drivers/mtd/Makefile 2008-08-27 19:37:48.000000000 -0700 -+++ linux-2.6.26.3/drivers/mtd/Makefile 2008-08-27 19:39:14.000000000 -0700 +--- a/drivers/mtd/Makefile ++++ b/drivers/mtd/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o @@ -25,9 +23,8 @@ diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Ma # 'Users' - code which presents functionality to userspace. obj-$(CONFIG_MTD_CHAR) += mtdchar.o -diff -ruN linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c linux-2.6.26.3/drivers/mtd/maps/physmap.c ---- linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c 2008-08-27 19:37:48.000000000 -0700 -+++ linux-2.6.26.3/drivers/mtd/maps/physmap.c 2008-08-27 19:39:14.000000000 -0700 +--- a/drivers/mtd/maps/physmap.c ++++ b/drivers/mtd/maps/physmap.c @@ -87,7 +87,8 @@ static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; diff --git a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch index cd5d744de..a3ce66940 100644 --- a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch +++ b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch @@ -1,6 +1,6 @@ --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -913,6 +913,15 @@ +@@ -960,6 +960,15 @@ To compile this driver as a module, choose M here: the module will be called mwave. @@ -18,7 +18,7 @@ depends on SCx200 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -90,6 +90,7 @@ +@@ -91,6 +91,7 @@ obj-$(CONFIG_PPDEV) += ppdev.o obj-$(CONFIG_NWBUTTON) += nwbutton.o obj-$(CONFIG_NWFLASH) += nwflash.o diff --git a/target/linux/ar7/patches-2.6.26/130-vlynq.patch b/target/linux/ar7/patches-2.6.26/130-vlynq.patch index 8fb613de5..c1e04a6db 100644 --- a/target/linux/ar7/patches-2.6.26/130-vlynq.patch +++ b/target/linux/ar7/patches-2.6.26/130-vlynq.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26/drivers/Kconfig -=================================================================== ---- linux-2.6.26.orig/drivers/Kconfig 2008-07-13 23:51:29.000000000 +0200 -+++ linux-2.6.26/drivers/Kconfig 2008-07-14 12:28:00.186793402 +0200 +--- a/drivers/Kconfig ++++ b/drivers/Kconfig @@ -100,5 +100,7 @@ source "drivers/uio/Kconfig" @@ -10,10 +8,8 @@ Index: linux-2.6.26/drivers/Kconfig + source "drivers/xen/Kconfig" endmenu -Index: linux-2.6.26/drivers/Makefile -=================================================================== ---- linux-2.6.26.orig/drivers/Makefile 2008-07-13 23:51:29.000000000 +0200 -+++ linux-2.6.26/drivers/Makefile 2008-07-14 12:27:34.362789842 +0200 +--- a/drivers/Makefile ++++ b/drivers/Makefile @@ -92,5 +92,6 @@ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ diff --git a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch index 6444cac88..18477997e 100644 --- a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch +++ b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -1874,7 +1874,7 @@ +@@ -1867,7 +1867,7 @@ config CPMAC tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" diff --git a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch index a40d4a377..00709186e 100644 --- a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch +++ b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch @@ -1,6 +1,6 @@ --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c -@@ -267,6 +267,13 @@ +@@ -266,6 +266,13 @@ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .flags = UART_CAP_FIFO, }, @@ -14,7 +14,7 @@ }; #if defined (CONFIG_SERIAL_8250_AU1X00) -@@ -2455,7 +2462,11 @@ +@@ -2524,7 +2531,11 @@ { struct uart_8250_port *up = (struct uart_8250_port *)port; diff --git a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch index 16e732046..63ced873e 100644 --- a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch +++ b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch @@ -17,8 +17,8 @@ because other drivers do it in the same way. Signed-off-by: Stefan Weil <weil@mail.berlios.de> ---- a/drivers/net/cpmac.c 2008-07-13 23:51:29.000000000 +0200 -+++ b/drivers/net/cpmac.c 2008-08-14 20:48:49.000000000 +0200 +--- a/drivers/net/cpmac.c ++++ b/drivers/net/cpmac.c @@ -627,7 +627,7 @@ dev_kfree_skb_irq(desc->skb); desc->skb = NULL; diff --git a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff index 7da22cd99..43479f881 100644 --- a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff +++ b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff @@ -1,6 +1,6 @@ --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -936,7 +936,8 @@ +@@ -948,7 +948,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; -@@ -948,11 +949,11 @@ +@@ -960,11 +961,11 @@ priv->oldspeed = priv->phy->speed; } diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 1572c8431..b3353f7d3 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -11,7 +11,7 @@ BOARD:=ar71xx BOARDNAME:=Atheros AR71xx FEATURES:=squashfs tgz broken -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch index ca989adea..a1e82808c 100644 --- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch +++ b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch @@ -131,7 +131,7 @@ source "arch/mips/au1000/Kconfig" source "arch/mips/basler/excite/Kconfig" source "arch/mips/jazz/Kconfig" -@@ -876,6 +877,9 @@ +@@ -879,6 +880,9 @@ config SYNC_R4K bool diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 4385a1763..e616467a5 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -11,7 +11,7 @@ BOARD:=at91 BOARDNAME:=Atmel AT91 FEATURES:=squashfs usb -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index e4e2a423c..b3c44209a 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros 231x/5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 7cc7a9330..4db3a39dc 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -11,7 +11,7 @@ BOARD:=au1000 BOARDNAME:=RMI/AMD AU1x00 FEATURES:=jffs2 usb pci -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += yamonenv diff --git a/target/linux/au1000/patches/017-gpio-dir.patch b/target/linux/au1000/patches/017-gpio-dir.patch index c499d38e7..982d10af4 100644 --- a/target/linux/au1000/patches/017-gpio-dir.patch +++ b/target/linux/au1000/patches/017-gpio-dir.patch @@ -1,5 +1,5 @@ ---- linux-2.6.25.16/arch/mips/au1000/common/gpio.c.org 2008-09-04 22:32:12.000000000 +0200 -+++ linux-2.6.25.16/arch/mips/au1000/common/gpio.c 2008-09-04 23:10:18.000000000 +0200 +--- a/arch/mips/au1000/common/gpio.c ++++ b/arch/mips/au1000/common/gpio.c @@ -66,7 +66,8 @@ static int au1xxx_gpio2_direction_output(unsigned gpio, int value) { diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 49c7c4615..6d24ecffb 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -10,7 +10,7 @@ ARCH:=avr32 BOARD:=avr32 BOARDNAME:=Atmel AVR32 FEATURES:=squashfs -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 36205aed6..bad5ec108 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-switch kmod-diag diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index cc2da9b7a..7005d0163 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM963xx FEATURES:=squashfs jffs2 broken usb atm -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile index 543e0b012..dcc0c37a7 100644 --- a/target/linux/etrax/Makefile +++ b/target/linux/etrax/Makefile @@ -10,7 +10,7 @@ ARCH:=cris BOARD:=etrax BOARDNAME:=Foxboard (ETRAX 100LX) FEATURES:=squashfs jffs2 broken -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/etrax/patches/100-compile_fixes.patch b/target/linux/etrax/patches/100-compile_fixes.patch index 59d47c683..ea6d08e86 100644 --- a/target/linux/etrax/patches/100-compile_fixes.patch +++ b/target/linux/etrax/patches/100-compile_fixes.patch @@ -1,6 +1,5 @@ -diff -urN linux-2.6.25.7/arch/cris/Makefile linux-2.6.25.7.cris/arch/cris/Makefile ---- linux-2.6.25.7/arch/cris/Makefile 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/Makefile 2008-06-24 13:22:48.000000000 +0200 +--- a/arch/cris/Makefile ++++ b/arch/cris/Makefile @@ -33,7 +33,7 @@ LD = $(CROSS_COMPILE)ld -mcrislinux @@ -10,9 +9,8 @@ diff -urN linux-2.6.25.7/arch/cris/Makefile linux-2.6.25.7.cris/arch/cris/Makefi CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) -diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile ---- linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile 2008-06-24 13:23:03.000000000 +0200 +--- a/arch/cris/arch-v10/boot/Makefile ++++ b/arch/cris/arch-v10/boot/Makefile @@ -2,9 +2,6 @@ # arch/cris/arch-v10/boot/Makefile # @@ -31,9 +29,8 @@ diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile linux-2.6.25.7.cris/ar $(obj)/zImage: $(obj)/compressed/vmlinux @cp $< $@ -diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile ---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-24 13:23:14.000000000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/Makefile ++++ b/arch/cris/arch-v10/boot/compressed/Makefile @@ -2,13 +2,9 @@ # arch/cris/arch-v10/boot/compressed/Makefile # @@ -61,18 +58,16 @@ diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.2 $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE $(call if_changed,image) -diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld ---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-24 12:57:25.000000000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/decompress.ld ++++ b/arch/cris/arch-v10/boot/compressed/decompress.ld @@ -1,4 +1,4 @@ -OUTPUT_FORMAT(elf32-us-cris) +OUTPUT_FORMAT(elf32-cris) MEMORY { -diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S ---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S 2008-06-24 13:24:50.000000000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/head.S ++++ b/arch/cris/arch-v10/boot/compressed/head.S @@ -10,13 +10,14 @@ #define ASSEMBLER_MACROS_ONLY @@ -227,9 +222,8 @@ diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S linux-2.6.25. +cmd_line_addr: .dword 0 #include "../../lib/hw_settings.S" -diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c ---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-24 12:57:25.000000000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/misc.c ++++ b/arch/cris/arch-v10/boot/compressed/misc.c @@ -5,7 +5,7 @@ * adapted for Linux. * @@ -294,9 +288,8 @@ diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c linux-2.6.25. - puts("Done. Now booting the kernel.\n"); + putstr("Done. Now booting the kernel.\n"); } -diff -urN linux-2.6.25.7/arch/cris/arch-v10/mm/init.c linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c ---- linux-2.6.25.7/arch/cris/arch-v10/mm/init.c 2008-06-16 22:24:36.000000000 +0200 -+++ linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c 2008-06-24 12:57:25.000000000 +0200 +--- a/arch/cris/arch-v10/mm/init.c ++++ b/arch/cris/arch-v10/mm/init.c @@ -184,6 +184,9 @@ free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0); diff --git a/target/linux/etrax/patches/101-cris-eth-driver.patch b/target/linux/etrax/patches/101-cris-eth-driver.patch index f003f50e5..f73b379dd 100644 --- a/target/linux/etrax/patches/101-cris-eth-driver.patch +++ b/target/linux/etrax/patches/101-cris-eth-driver.patch @@ -1,5 +1,5 @@ ---- linux-2.6.25.7/drivers/net/cris/eth_v10.c.orig 2008-06-24 13:37:48.000000000 +0200 -+++ linux-2.6.25.7/drivers/net/cris/eth_v10.c 2008-06-24 13:37:58.000000000 +0200 +--- a/drivers/net/cris/eth_v10.c ++++ b/drivers/net/cris/eth_v10.c @@ -1707,7 +1707,7 @@ static void e100_netpoll(struct net_device* netdev) diff --git a/target/linux/etrax/patches/102-missing_arch_include.patch b/target/linux/etrax/patches/102-missing_arch_include.patch index 7e862524c..8955712b2 100644 --- a/target/linux/etrax/patches/102-missing_arch_include.patch +++ b/target/linux/etrax/patches/102-missing_arch_include.patch @@ -1,5 +1,5 @@ ---- linux-2.6.25.7/include/asm-cris/Kbuild.orig 2008-06-23 12:24:03.000000000 +0200 -+++ linux-2.6.25.7/include/asm-cris/Kbuild 2008-06-23 12:24:23.000000000 +0200 +--- a/include/asm-cris/Kbuild ++++ b/include/asm-cris/Kbuild @@ -1,7 +1,6 @@ include include/asm-generic/Kbuild.asm diff --git a/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch b/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch deleted file mode 100644 index c70181c61..000000000 --- a/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -531,8 +531,8 @@ - tasklet_schedule(&acm->urb_task); - - done: --err_out: - mutex_unlock(&acm->mutex); -+err_out: - mutex_unlock(&open_mutex); - return rv; - diff --git a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch index df805f528..9c69385df 100644 --- a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch +++ b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch @@ -833,7 +833,7 @@ +MODULE_ALIAS("ipt_portscan"); --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -1553,6 +1553,8 @@ +@@ -1554,6 +1554,8 @@ return seq; } diff --git a/target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch deleted file mode 100644 index 51ca9746c..000000000 --- a/target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/linux/pim.h -+++ b/include/linux/pim.h -@@ -9,7 +9,7 @@ - __u8 pim_type:4, /* PIM message type */ - pim_ver:4; /* PIM version */ - #elif defined(__BIG_ENDIAN_BITFIELD) -- __u8 pim_ver:4; /* PIM version */ -+ __u8 pim_ver:4, /* PIM version */ - pim_type:4; /* PIM message type */ - #endif - __u8 pim_rsv; /* Reserved */ diff --git a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch index 627f3538a..003d28c0c 100644 --- a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch +++ b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch @@ -44,7 +44,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -666,6 +676,61 @@ +@@ -667,6 +677,61 @@ } #endif diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile index 9d3ec23c7..de982abf1 100644 --- a/target/linux/ifxmips/Makefile +++ b/target/linux/ifxmips/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=ifxmips BOARDNAME:=Infineon Mips FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.26.2 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=uboot-ifxmips diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index 0e82af76b..db43c90b2 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -22,7 +22,7 @@ config MACH_DECSTATION bool "DECstations" select BOOT_ELF32 -@@ -693,6 +708,7 @@ +@@ -697,6 +712,7 @@ source "arch/mips/tx4927/Kconfig" source "arch/mips/tx4938/Kconfig" source "arch/mips/vr41xx/Kconfig" @@ -63,7 +63,7 @@ extern char *system_type; --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c -@@ -1379,6 +1379,7 @@ +@@ -1464,6 +1464,7 @@ */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl() >> 29) & 7; diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch index 3233fd95c..a25c57003 100644 --- a/target/linux/ifxmips/patches/110-drivers.patch +++ b/target/linux/ifxmips/patches/110-drivers.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26.2/drivers/char/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/char/Makefile 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/char/Makefile 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/char/Makefile ++++ b/drivers/char/Makefile @@ -114,6 +114,10 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o @@ -13,19 +11,15 @@ Index: linux-2.6.26.2/drivers/char/Makefile # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c -Index: linux-2.6.26.2/drivers/mtd/maps/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/mtd/maps/Makefile 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/mtd/maps/Makefile 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/mtd/maps/Makefile ++++ b/drivers/mtd/maps/Makefile @@ -67,3 +67,4 @@ obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o +obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o -Index: linux-2.6.26.2/drivers/net/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/net/Kconfig 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/net/Kconfig 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig @@ -351,6 +351,12 @@ source "drivers/net/arm/Kconfig" @@ -39,10 +33,8 @@ Index: linux-2.6.26.2/drivers/net/Kconfig config AX88796 tristate "ASIX AX88796 NE2000 clone support" depends on ARM || MIPS || SUPERH -Index: linux-2.6.26.2/drivers/serial/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/serial/Kconfig 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/serial/Kconfig 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/serial/Kconfig ++++ b/drivers/serial/Kconfig @@ -1334,6 +1334,14 @@ Currently, only 8250 compatible ports are supported, but others can easily be added. @@ -58,19 +50,15 @@ Index: linux-2.6.26.2/drivers/serial/Kconfig config SERIAL_QE tristate "Freescale QUICC Engine serial port support" depends on QUICC_ENGINE -Index: linux-2.6.26.2/drivers/serial/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/serial/Makefile 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/serial/Makefile 2008-09-09 01:46:23.000000000 +0200 +--- a/drivers/serial/Makefile ++++ b/drivers/serial/Makefile @@ -68,3 +68,4 @@ obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o -Index: linux-2.6.26.2/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Makefile 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Makefile 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o @@ -79,20 +67,16 @@ Index: linux-2.6.26.2/drivers/watchdog/Makefile # PARISC Architecture -Index: linux-2.6.26.2/drivers/net/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/net/Makefile 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/net/Makefile 2008-09-09 01:47:02.000000000 +0200 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile @@ -256,4 +256,4 @@ obj-$(CONFIG_NIU) += niu.o obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_SFC) += sfc/ - +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o -Index: linux-2.6.26.2/drivers/crypto/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/crypto/Kconfig 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/crypto/Kconfig 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/crypto/Kconfig ++++ b/drivers/crypto/Kconfig @@ -9,6 +9,9 @@ If you say N, all options in this submenu will be skipped and disabled. @@ -103,19 +87,15 @@ Index: linux-2.6.26.2/drivers/crypto/Kconfig config CRYPTO_DEV_PADLOCK tristate "Support for VIA PadLock ACE" -Index: linux-2.6.26.2/drivers/crypto/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/crypto/Makefile 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/crypto/Makefile 2008-09-09 01:47:30.000000000 +0200 +--- a/drivers/crypto/Makefile ++++ b/drivers/crypto/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o -Index: linux-2.6.26.2/drivers/usb/host/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/usb/host/Kconfig 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/usb/host/Kconfig 2008-09-09 01:48:14.000000000 +0200 +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig @@ -305,3 +305,10 @@ help This driver enables support for the on-chip R8A66597 in the @@ -127,10 +107,8 @@ Index: linux-2.6.26.2/drivers/usb/host/Kconfig + default y + help + Danube USB Host Controller -Index: linux-2.6.26.2/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/leds/Kconfig 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/leds/Kconfig 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig @@ -153,6 +153,12 @@ To compile this driver as a module, choose M here: the module will be called leds-clevo-mail. @@ -144,10 +122,8 @@ Index: linux-2.6.26.2/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.26.2/drivers/leds/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/leds/Makefile 2008-09-09 01:44:53.000000000 +0200 -+++ linux-2.6.26.2/drivers/leds/Makefile 2008-09-09 01:49:25.000000000 +0200 +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o @@ -156,10 +132,8 @@ Index: linux-2.6.26.2/drivers/leds/Makefile # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.26.2/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Kconfig 2008-09-09 01:44:51.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Kconfig 2008-09-09 01:45:41.000000000 +0200 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig @@ -683,6 +683,12 @@ help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch index 51b82023a..7649ec1ff 100644 --- a/target/linux/ifxmips/patches/160-cfi-swap.patch +++ b/target/linux/ifxmips/patches/160-cfi-swap.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1015,7 +1015,9 @@ +@@ -1041,7 +1041,9 @@ int retry_cnt = 0; adr += chip->start; diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index e46e0c80c..2fe245b50 100644 --- a/target/linux/iop32x/Makefile +++ b/target/linux/iop32x/Makefile @@ -11,7 +11,7 @@ BOARD:=iop32x BOARDNAME:=Intel IOP32x FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 51155663b..9bae182b2 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.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile index f170208d2..085e02f5e 100644 --- a/target/linux/magicbox/Makefile +++ b/target/linux/magicbox/Makefile @@ -11,7 +11,7 @@ BOARD:=magicbox BOARDNAME:=Magicbox FEATURES:=squashfs pci -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 LINUX_KARCH:=ppc include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 7fc961cd9..0f7064ae1 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -11,7 +11,7 @@ BOARD:=orion BOARDNAME:=Marvell Orion FEATURES:=squashfs -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/patches/000-orion_git_sync.patch b/target/linux/orion/patches/000-orion_git_sync.patch index 335c996c9..4daef75d5 100644 --- a/target/linux/orion/patches/000-orion_git_sync.patch +++ b/target/linux/orion/patches/000-orion_git_sync.patch @@ -1,6 +1,6 @@ --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2686,12 +2686,10 @@ +@@ -2691,12 +2691,10 @@ S: Maintained MARVELL MV643XX ETHERNET DRIVER diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 38c16c1e3..daf808b8e 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -11,7 +11,7 @@ BOARD:=ppc40x BOARDNAME:=AMCC/IBM PPC40x FEATURES:=squashfs -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 LINUX_KARCH:=powerpc include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 1c13f4ce9..5e025a82c 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -11,7 +11,7 @@ BOARD:=ppc44x BOARDNAME:=AMCC/IBM PPC44x FEATURES:=squashfs -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 LINUX_KARCH:=powerpc include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile index 3e559eb42..daa2c62d7 100644 --- a/target/linux/ps3/Makefile +++ b/target/linux/ps3/Makefile @@ -10,7 +10,7 @@ ARCH:=powerpc BOARD:=ps3 BOARDNAME:=Sony PS3 Game Console -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 KERNEL_CC:= diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index 41cd69034..f4436a84c 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -11,7 +11,7 @@ BOARD:=sibyte BOARDNAME:=Broadcom/SiByte SB-1 FEATURES:=broken -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index e09751314..659eaec70 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext2 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH) -LINUX_VERSION:=2.6.26.3 +LINUX_VERSION:=2.6.26.5 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 3288de347..9e46cfec3 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 vdi SUBTARGETS=generic -LINUX_VERSION:=2.6.25.16 +LINUX_VERSION:=2.6.25.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci |