[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

4 files changed, 30 insertions, 56 deletions

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;