refresh kernel patches

SVN-Revision: 11197

8 files changed, 48 insertions, 48 deletions

diff --git a/target/linux/atheros/patches-2.6.25/100-board.patch b/target/linux/atheros/patches-2.6.25/100-board.patch
index 30f001acde..fc3bb45999 100644
--- a/target/linux/atheros/patches-2.6.25/100-board.patch
+++ b/target/linux/atheros/patches-2.6.25/100-board.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/mips/Kconfig
+Index: linux-2.6.25.4/arch/mips/Kconfig
 ===================================================================
---- linux-2.6.25.1.orig/arch/mips/Kconfig
-+++ linux-2.6.25.1/arch/mips/Kconfig
+--- linux-2.6.25.4.orig/arch/mips/Kconfig
++++ linux-2.6.25.4/arch/mips/Kconfig
 @@ -59,6 +59,18 @@ config BCM47XX
  	help
  	 Support for BCM47XX based boards
@@ -29,10 +29,10 @@ Index: linux-2.6.25.1/arch/mips/Kconfig
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/basler/excite/Kconfig"
  source "arch/mips/jazz/Kconfig"
-Index: linux-2.6.25.1/arch/mips/Makefile
+Index: linux-2.6.25.4/arch/mips/Makefile
 ===================================================================
---- linux-2.6.25.1.orig/arch/mips/Makefile
-+++ linux-2.6.25.1/arch/mips/Makefile
+--- linux-2.6.25.4.orig/arch/mips/Makefile
++++ linux-2.6.25.4/arch/mips/Makefile
 @@ -276,6 +276,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
  load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
  
@@ -47,10 +47,10 @@ Index: linux-2.6.25.1/arch/mips/Makefile
  # Cobalt Server
  #
  core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
-Index: linux-2.6.25.1/include/asm-mips/bootinfo.h
+Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
 ===================================================================
---- linux-2.6.25.1.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.25.1/include/asm-mips/bootinfo.h
+--- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.25.4/include/asm-mips/bootinfo.h
 @@ -94,6 +94,18 @@
  #define MACH_MSP7120_FPGA       5	/* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255	/* PMC-Sierra unknown board type */
diff --git a/target/linux/atheros/patches-2.6.25/110-spiflash.patch b/target/linux/atheros/patches-2.6.25/110-spiflash.patch
index bb66f02fb5..3363f11f62 100644
--- a/target/linux/atheros/patches-2.6.25/110-spiflash.patch
+++ b/target/linux/atheros/patches-2.6.25/110-spiflash.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/mtd/devices/Kconfig
+Index: linux-2.6.25.4/drivers/mtd/devices/Kconfig
 ===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/devices/Kconfig
-+++ linux-2.6.25.1/drivers/mtd/devices/Kconfig
+--- linux-2.6.25.4.orig/drivers/mtd/devices/Kconfig
++++ linux-2.6.25.4/drivers/mtd/devices/Kconfig
 @@ -77,6 +77,10 @@ config MTD_M25P80
  	  if you want to specify device partitioning or to use a device which
  	  doesn't support the JEDEC ID instruction.
@@ -13,10 +13,10 @@ Index: linux-2.6.25.1/drivers/mtd/devices/Kconfig
  config MTD_SLRAM
  	tristate "Uncached system RAM"
  	help
-Index: linux-2.6.25.1/drivers/mtd/devices/Makefile
+Index: linux-2.6.25.4/drivers/mtd/devices/Makefile
 ===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/devices/Makefile
-+++ linux-2.6.25.1/drivers/mtd/devices/Makefile
+--- linux-2.6.25.4.orig/drivers/mtd/devices/Makefile
++++ linux-2.6.25.4/drivers/mtd/devices/Makefile
 @@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART)		+= lart.o
  obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd.o
  obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
diff --git a/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch
index 2d2ce45599..a0403c363e 100644
--- a/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/Kconfig
+Index: linux-2.6.25.4/drivers/net/Kconfig
 ===================================================================
---- linux-2.6.25.1.orig/drivers/net/Kconfig
-+++ linux-2.6.25.1/drivers/net/Kconfig
+--- linux-2.6.25.4.orig/drivers/net/Kconfig
++++ linux-2.6.25.4/drivers/net/Kconfig
 @@ -367,6 +367,12 @@ config AX88796_93CX6
  	help
  	  Select this if your platform comes with an external 93CX6 eeprom.
@@ -15,10 +15,10 @@ Index: linux-2.6.25.1/drivers/net/Kconfig
  config MACE
  	tristate "MACE (Power Mac ethernet) support"
  	depends on PPC_PMAC && PPC32
-Index: linux-2.6.25.1/drivers/net/Makefile
+Index: linux-2.6.25.4/drivers/net/Makefile
 ===================================================================
---- linux-2.6.25.1.orig/drivers/net/Makefile
-+++ linux-2.6.25.1/drivers/net/Makefile
+--- linux-2.6.25.4.orig/drivers/net/Makefile
++++ linux-2.6.25.4/drivers/net/Makefile
 @@ -194,6 +194,7 @@ obj-$(CONFIG_MVME147_NET) += mvme147.o 7
  obj-$(CONFIG_EQUALIZER) += eql.o
  obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
diff --git a/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch
index 467fcada2e..37dcc6794a 100644
--- a/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch
+++ b/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/mtd/redboot.c
+Index: linux-2.6.25.4/drivers/mtd/redboot.c
 ===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.1/drivers/mtd/redboot.c
+--- linux-2.6.25.4.orig/drivers/mtd/redboot.c
++++ linux-2.6.25.4/drivers/mtd/redboot.c
 @@ -59,31 +59,32 @@ static int parse_redboot_partitions(stru
  	static char nullstring[] = "unallocated";
  #endif
diff --git a/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch
index ffff0cd34c..8fd3dacdd8 100644
--- a/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch
+++ b/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/net/core/dev.c
+Index: linux-2.6.25.4/net/core/dev.c
 ===================================================================
---- linux-2.6.25.1.orig/net/core/dev.c
-+++ linux-2.6.25.1/net/core/dev.c
+--- linux-2.6.25.4.orig/net/core/dev.c
++++ linux-2.6.25.4/net/core/dev.c
 @@ -3755,8 +3755,8 @@ int register_netdevice(struct net_device
  	/* Fix illegal SG+CSUM combinations. */
  	if ((dev->features & NETIF_F_SG) &&
diff --git a/target/linux/atheros/patches-2.6.25/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.25/200-ar2313_enable_mvswitch.patch
index 1c7d7c2365..c12abfcb1f 100644
--- a/target/linux/atheros/patches-2.6.25/200-ar2313_enable_mvswitch.patch
+++ b/target/linux/atheros/patches-2.6.25/200-ar2313_enable_mvswitch.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.25.1/drivers/net/ar2313/ar2313.c
+Index: linux-2.6.25.4/drivers/net/ar2313/ar2313.c
 ===================================================================
---- linux-2.6.25.1.orig/drivers/net/ar2313/ar2313.c	2008-05-13 00:49:39.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/ar2313/ar2313.c	2008-05-13 00:49:42.000000000 +0200
-@@ -953,9 +953,9 @@
+--- linux-2.6.25.4.orig/drivers/net/ar2313/ar2313.c
++++ linux-2.6.25.4/drivers/net/ar2313/ar2313.c
+@@ -953,9 +953,9 @@ static int ar2313_rx_int(struct net_devi
  						((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
  
  				dev->stats.rx_bytes += skb->len;
@@ -14,7 +14,7 @@ Index: linux-2.6.25.1/drivers/net/ar2313/ar2313.c
  
  				skb_new->dev = dev;
  				/* 16 bit align */
-@@ -1370,6 +1370,8 @@
+@@ -1370,6 +1370,8 @@ static int mdiobus_probe (struct net_dev
  		return PTR_ERR(phydev);
  	}
  
@@ -23,11 +23,11 @@ Index: linux-2.6.25.1/drivers/net/ar2313/ar2313.c
  	/* mask with MAC supported features */
  	phydev->supported &= (SUPPORTED_10baseT_Half
  		| SUPPORTED_10baseT_Full
-Index: linux-2.6.25.1/drivers/net/ar2313/ar2313.h
+Index: linux-2.6.25.4/drivers/net/ar2313/ar2313.h
 ===================================================================
---- linux-2.6.25.1.orig/drivers/net/ar2313/ar2313.h	2008-05-13 00:49:39.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/ar2313/ar2313.h	2008-05-13 00:49:42.000000000 +0200
-@@ -107,6 +107,8 @@
+--- linux-2.6.25.4.orig/drivers/net/ar2313/ar2313.h
++++ linux-2.6.25.4/drivers/net/ar2313/ar2313.h
+@@ -107,6 +107,8 @@ typedef struct {
   */
  struct ar2313_private {
  	struct net_device *dev;
diff --git a/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch
index 3b72a9e273..f35e0d2fa7 100644
--- a/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch
+++ b/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/mips/kernel/cevt-r4k.c
+Index: linux-2.6.25.4/arch/mips/kernel/cevt-r4k.c
 ===================================================================
---- linux-2.6.25.1.orig/arch/mips/kernel/cevt-r4k.c
-+++ linux-2.6.25.1/arch/mips/kernel/cevt-r4k.c
+--- linux-2.6.25.4.orig/arch/mips/kernel/cevt-r4k.c
++++ linux-2.6.25.4/arch/mips/kernel/cevt-r4k.c
 @@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)
  	while ((int)(read_c0_count() - cnt) <= 0)
  		;	/* Wait for expiry  */
diff --git a/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch
index 1e548c8f00..782bd7c72c 100644
--- a/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch
+++ b/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/mips/kernel/traps.c
+Index: linux-2.6.25.4/arch/mips/kernel/traps.c
 ===================================================================
---- linux-2.6.25.1.orig/arch/mips/kernel/traps.c
-+++ linux-2.6.25.1/arch/mips/kernel/traps.c
+--- linux-2.6.25.4.orig/arch/mips/kernel/traps.c
++++ linux-2.6.25.4/arch/mips/kernel/traps.c
 @@ -42,6 +42,7 @@
  #include <asm/mmu_context.h>
  #include <asm/types.h>
@@ -19,10 +19,10 @@ Index: linux-2.6.25.1/arch/mips/kernel/traps.c
  		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
  		if (cp0_perfcount_irq == cp0_compare_irq)
  			cp0_perfcount_irq = -1;
-Index: linux-2.6.25.1/include/asm-mips/time.h
+Index: linux-2.6.25.4/include/asm-mips/time.h
 ===================================================================
---- linux-2.6.25.1.orig/include/asm-mips/time.h
-+++ linux-2.6.25.1/include/asm-mips/time.h
+--- linux-2.6.25.4.orig/include/asm-mips/time.h
++++ linux-2.6.25.4/include/asm-mips/time.h
 @@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
  #ifdef CONFIG_CEVT_R4K
  extern int mips_clockevent_init(void);
@@ -31,10 +31,10 @@ Index: linux-2.6.25.1/include/asm-mips/time.h
  #else
  static inline int mips_clockevent_init(void)
  {
-Index: linux-2.6.25.1/arch/mips/atheros/board.c
+Index: linux-2.6.25.4/arch/mips/atheros/board.c
 ===================================================================
---- linux-2.6.25.1.orig/arch/mips/atheros/board.c
-+++ linux-2.6.25.1/arch/mips/atheros/board.c
+--- linux-2.6.25.4.orig/arch/mips/atheros/board.c
++++ linux-2.6.25.4/arch/mips/atheros/board.c
 @@ -205,6 +205,11 @@ void (*board_time_init)(void);
  void __init plat_time_init(void) {
      board_time_init();