upgrade to 2.6.25.7, and refresh patches

SVN-Revision: 11523

9 files changed, 23 insertions, 39 deletions

diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 1cb9de70a1..48c376d2ef 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.6
+LINUX_VERSION:=2.6.25.7
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += yamonenv
diff --git a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
index a99070dd46..bac9463e04 100644
--- a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
+++ b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
@@ -10,11 +10,9 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
  arch/mips/au1000/Kconfig |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-Index: linux-2.6.25.4/arch/mips/au1000/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/au1000/Kconfig
-+++ linux-2.6.25.4/arch/mips/au1000/Kconfig
-@@ -135,3 +135,4 @@ config SOC_AU1X00
+--- a/arch/mips/au1000/Kconfig
++++ b/arch/mips/au1000/Kconfig
+@@ -135,3 +135,4 @@
  	select SYS_SUPPORTS_32BIT_KERNEL
  	select SYS_SUPPORTS_APM_EMULATION
  	select SYS_SUPPORTS_KGDB
diff --git a/target/linux/au1000/patches/002-sys_btn_gpio.patch b/target/linux/au1000/patches/002-sys_btn_gpio.patch
index 65102f26ad..a3aa7ad679 100644
--- a/target/linux/au1000/patches/002-sys_btn_gpio.patch
+++ b/target/linux/au1000/patches/002-sys_btn_gpio.patch
@@ -2,10 +2,8 @@ This patch adds support for the GPIO connected system button on the MTX-1 boards
 
 Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
 ---
-Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/platform.c
-+++ linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
+--- a/arch/mips/au1000/mtx-1/platform.c
++++ b/arch/mips/au1000/mtx-1/platform.c
 @@ -23,9 +23,32 @@
  #include <linux/types.h>
  #include <linux/platform_device.h>
@@ -39,7 +37,7 @@ Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
  static struct resource mtx1_wdt_res[] = {
  	[0] = {
  		.start = 15,
-@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
+@@ -62,11 +85,13 @@
  
  static struct platform_device *mtx1_devs[] = {
  	&mtx1_gpio_leds,
diff --git a/target/linux/au1000/patches/005-au1000_eth_link_beat.patch b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
index 9a7ec80fef..8ba5f0024e 100644
--- a/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
+++ b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/drivers/net/au1000_eth.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
-+++ linux-2.6.25.4/drivers/net/au1000_eth.c
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
 @@ -15,6 +15,9 @@
   * Author: MontaVista Software, Inc.
   *         	ppopov@mvista.com or source@mvista.com
@@ -12,7 +10,7 @@ Index: linux-2.6.25.4/drivers/net/au1000_eth.c
   * ########################################################################
   *
   *  This program is free software; you can distribute it and/or modify it
-@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
+@@ -835,6 +838,10 @@
  
  	control = MAC_RX_ENABLE | MAC_TX_ENABLE;
  #ifndef CONFIG_CPU_LITTLE_ENDIAN
diff --git a/target/linux/au1000/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
index 2ac4dd5a97..ee8b541b81 100644
--- a/target/linux/au1000/patches/012-mtx1_cmdline.patch
+++ b/target/linux/au1000/patches/012-mtx1_cmdline.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/init.c
-+++ linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
-@@ -54,7 +54,7 @@ void __init prom_init(void)
+--- a/arch/mips/au1000/mtx-1/init.c
++++ b/arch/mips/au1000/mtx-1/init.c
+@@ -54,7 +54,7 @@
  	prom_argv = (char **) fw_arg1;
  	prom_envp = (char **) fw_arg2;
  
diff --git a/target/linux/au1000/patches/013-openwrt_rootfs.patch b/target/linux/au1000/patches/013-openwrt_rootfs.patch
index 3a36373970..414aa39583 100644
--- a/target/linux/au1000/patches/013-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches/013-openwrt_rootfs.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/mtx-1_flash.c
-+++ linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
-@@ -28,7 +28,7 @@ static struct map_info mtx1_map = {
+--- a/drivers/mtd/maps/mtx-1_flash.c
++++ b/drivers/mtd/maps/mtx-1_flash.c
+@@ -28,7 +28,7 @@
  
  static struct mtd_partition mtx1_partitions[] = {
          {
diff --git a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
index d8b3aecab4..ed308f8190 100644
--- a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/net/au1000_eth.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
-+++ linux-2.6.25.4/drivers/net/au1000_eth.c
-@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
+@@ -1306,9 +1306,12 @@
  	}
  }
  
diff --git a/target/linux/au1000/patches/015-pci-resource.patch b/target/linux/au1000/patches/015-pci-resource.patch
index 4f2158f95d..7b0bc896b3 100644
--- a/target/linux/au1000/patches/015-pci-resource.patch
+++ b/target/linux/au1000/patches/015-pci-resource.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/arch/mips/au1000/common/pci.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/au1000/common/pci.c
-+++ linux-2.6.25.4/arch/mips/au1000/common/pci.c
+--- a/arch/mips/au1000/common/pci.c
++++ b/arch/mips/au1000/common/pci.c
 @@ -39,15 +39,15 @@
  
  /* TBD */
diff --git a/target/linux/au1000/patches/016-net-irq.patch b/target/linux/au1000/patches/016-net-irq.patch
index 565e7a4dde..4ad718bf6e 100644
--- a/target/linux/au1000/patches/016-net-irq.patch
+++ b/target/linux/au1000/patches/016-net-irq.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/mach-au1x00/au1000.h	2008-06-06 20:51:08.000000000 +0100
-+++ linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h	2008-06-06 20:51:48.000000000 +0100
+--- a/include/asm-mips/mach-au1x00/au1000.h
++++ b/include/asm-mips/mach-au1x00/au1000.h
 @@ -623,6 +623,7 @@
  	AU1000_RTC_MATCH1_INT,
  	AU1000_RTC_MATCH2_INT,