refresh kernel patches

SVN-Revision: 11197

6 files changed, 57 insertions, 51 deletions

diff --git a/target/linux/atheros/patches-2.6.23/100-board.patch b/target/linux/atheros/patches-2.6.23/100-board.patch
index 28509a3d0c..a3eef30cd1 100644
--- a/target/linux/atheros/patches-2.6.23/100-board.patch
+++ b/target/linux/atheros/patches-2.6.23/100-board.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
---- linux.old/arch/mips/Kconfig	2007-02-02 23:55:52.912446784 +0100
-+++ linux.dev/arch/mips/Kconfig	2007-02-03 21:50:25.262027104 +0100
-@@ -44,6 +44,16 @@
+Index: linux-2.6.23.17/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.23.17.orig/arch/mips/Kconfig
++++ linux-2.6.23.17/arch/mips/Kconfig
+@@ -44,6 +44,16 @@ config BASLER_EXCITE_PROTOTYPE
  	  note that a kernel built with this option selected will not be
  	  able to run on normal units.
  
@@ -18,7 +19,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  config MIPS_COBALT
  	bool "Cobalt Server"
  	select DMA_NONCOHERENT
-@@ -597,6 +607,7 @@
+@@ -597,6 +607,7 @@ config WR_PPMC
  
  endchoice
  
@@ -26,10 +27,11 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/jazz/Kconfig"
  source "arch/mips/pmc-sierra/Kconfig"
-diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
---- linux.old/arch/mips/Makefile	2007-02-02 23:55:52.913446632 +0100
-+++ linux.dev/arch/mips/Makefile	2007-02-03 17:40:29.193776000 +0100
-@@ -267,6 +267,13 @@
+Index: linux-2.6.23.17/arch/mips/Makefile
+===================================================================
+--- linux-2.6.23.17.orig/arch/mips/Makefile
++++ linux-2.6.23.17/arch/mips/Makefile
+@@ -270,6 +270,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
  load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
  
  #
@@ -43,12 +45,13 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  # Cobalt Server
  #
  core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
-diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
---- linux.old/include/asm-mips/bootinfo.h	2007-02-02 23:55:52.913446632 +0100
-+++ linux.dev/include/asm-mips/bootinfo.h	2007-02-03 17:51:02.531494032 +0100
-@@ -213,6 +213,18 @@
- #define MACH_GROUP_NEC_EMMA2RH 25	/* NEC EMMA2RH (was 23)		*/
- #define  MACH_NEC_MARKEINS	0	/* NEC EMMA2RH Mark-eins	*/
+Index: linux-2.6.23.17/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.6.23.17.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.23.17/include/asm-mips/bootinfo.h
+@@ -208,6 +208,18 @@
+ #define MACH_GROUP_WINDRIVER   28	/* Windriver boards */
+ #define MACH_WRPPMC             1
  
 +/*
 + * Valid machtype for group ATHEROS
@@ -65,4 +68,3 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
  #define CL_SIZE			COMMAND_LINE_SIZE
  
  const char *get_system_type(void);
-
diff --git a/target/linux/atheros/patches-2.6.23/110-spiflash.patch b/target/linux/atheros/patches-2.6.23/110-spiflash.patch
index fc4ef4c0f2..1199cbadf0 100644
--- a/target/linux/atheros/patches-2.6.23/110-spiflash.patch
+++ b/target/linux/atheros/patches-2.6.23/110-spiflash.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kconfig
---- linux.old/drivers/mtd/devices/Kconfig	2007-02-04 04:30:26.145338240 +0100
-+++ linux.dev/drivers/mtd/devices/Kconfig	2007-02-02 23:48:28.748969000 +0100
-@@ -76,6 +76,10 @@
+Index: linux-2.6.23.17/drivers/mtd/devices/Kconfig
+===================================================================
+--- linux-2.6.23.17.orig/drivers/mtd/devices/Kconfig
++++ linux-2.6.23.17/drivers/mtd/devices/Kconfig
+@@ -76,6 +76,10 @@ config MTD_M25P80
  	  used for program and data storage.  Set up your spi devices
  	  with the right board-specific platform data.
  
@@ -12,10 +13,11 @@ diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kc
  config MTD_SLRAM
  	tristate "Uncached system RAM"
  	help
-diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile
---- linux.old/drivers/mtd/devices/Makefile	2007-02-04 04:30:26.146338088 +0100
-+++ linux.dev/drivers/mtd/devices/Makefile	2007-02-02 23:48:28.749969000 +0100
-@@ -18,3 +18,4 @@
+Index: linux-2.6.23.17/drivers/mtd/devices/Makefile
+===================================================================
+--- linux-2.6.23.17.orig/drivers/mtd/devices/Makefile
++++ linux-2.6.23.17/drivers/mtd/devices/Makefile
+@@ -18,3 +18,4 @@ obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd
  obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
  obj-$(CONFIG_MTD_DATAFLASH26)	+= at91_dataflash26.o
  obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
diff --git a/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch
index 721eba663f..99dc4396f7 100644
--- a/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/drivers/net/Kconfig
+Index: linux-2.6.23.17/drivers/net/Kconfig
 ===================================================================
---- linux-2.6.23.orig/drivers/net/Kconfig	2007-10-14 00:55:22.000000000 +0200
-+++ linux-2.6.23/drivers/net/Kconfig	2007-10-14 00:56:32.000000000 +0200
-@@ -348,6 +348,12 @@
+--- linux-2.6.23.17.orig/drivers/net/Kconfig
++++ linux-2.6.23.17/drivers/net/Kconfig
+@@ -348,6 +348,12 @@ config AX88796
  	  AX88796 driver, using platform bus to provide
  	  chip detection and resources
  
@@ -15,11 +15,11 @@ Index: linux-2.6.23/drivers/net/Kconfig
  config MACE
  	tristate "MACE (Power Mac ethernet) support"
  	depends on PPC_PMAC && PPC32
-Index: linux-2.6.23/drivers/net/Makefile
+Index: linux-2.6.23.17/drivers/net/Makefile
 ===================================================================
---- linux-2.6.23.orig/drivers/net/Makefile	2007-10-14 00:55:22.000000000 +0200
-+++ linux-2.6.23/drivers/net/Makefile	2007-10-14 00:56:55.000000000 +0200
-@@ -182,6 +182,7 @@
+--- linux-2.6.23.17.orig/drivers/net/Makefile
++++ linux-2.6.23.17/drivers/net/Makefile
+@@ -182,6 +182,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o
  obj-$(CONFIG_LGUEST_NET) += lguest_net.o
  obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
  obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
diff --git a/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch
index de4ebeb553..2727d96c9a 100644
--- a/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch
+++ b/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c
---- linux.old/drivers/mtd/redboot.c	2006-12-14 23:53:29.000000000 +0100
-+++ linux.dev/drivers/mtd/redboot.c	2006-12-16 04:23:42.000000000 +0100
-@@ -64,6 +64,7 @@
+Index: linux-2.6.23.17/drivers/mtd/redboot.c
+===================================================================
+--- linux-2.6.23.17.orig/drivers/mtd/redboot.c
++++ linux-2.6.23.17/drivers/mtd/redboot.c
+@@ -64,6 +64,7 @@ static int parse_redboot_partitions(stru
  	if (!buf)
  		return -ENOMEM;
  
@@ -9,7 +10,7 @@ diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c
  	if ( directory < 0 )
  		offset = master->size + directory*master->erasesize;
  	else
-@@ -140,6 +141,11 @@
+@@ -140,6 +141,11 @@ static int parse_redboot_partitions(stru
  	}
  	if (i == numslots) {
  		/* Didn't find it */
@@ -21,4 +22,3 @@ diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c
  		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
  		       master->name);
  		ret = 0;
-
diff --git a/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch
index 0a35d89beb..ad8c57fc6a 100644
--- a/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch
+++ b/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch
@@ -1,6 +1,8 @@
---- linux-2.6.23.orig/net/core/dev.c	2007-10-12 23:42:06.000000000 +0200
-+++ linux-2.6.23/net/core/dev.c	2007-10-12 23:44:22.000000000 +0200
-@@ -3425,8 +3425,8 @@
+Index: linux-2.6.23.17/net/core/dev.c
+===================================================================
+--- linux-2.6.23.17.orig/net/core/dev.c
++++ linux-2.6.23.17/net/core/dev.c
+@@ -3426,8 +3426,8 @@ int register_netdevice(struct net_device
  	/* Fix illegal SG+CSUM combinations. */
  	if ((dev->features & NETIF_F_SG) &&
  	    !(dev->features & NETIF_F_ALL_CSUM)) {
@@ -11,7 +13,7 @@
  		dev->features &= ~NETIF_F_SG;
  	}
  
-@@ -3439,9 +3439,9 @@
+@@ -3440,9 +3440,9 @@ int register_netdevice(struct net_device
  	}
  	if (dev->features & NETIF_F_UFO) {
  		if (!(dev->features & NETIF_F_HW_CSUM)) {
diff --git a/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
index fb89bdb9fc..ddf7d1d8d6 100644
--- a/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
+++ b/target/linux/atheros/patches-2.6.23/200-ar2313_enable_mvswitch.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.16/drivers/net/ar2313/ar2313.c
+Index: linux-2.6.23.17/drivers/net/ar2313/ar2313.c
 ===================================================================
---- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.c	2008-04-29 14:51:39.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/ar2313/ar2313.c	2008-04-29 14:52:14.000000000 +0200
-@@ -953,9 +953,9 @@
+--- linux-2.6.23.17.orig/drivers/net/ar2313/ar2313.c
++++ linux-2.6.23.17/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.23.16/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.23.16/drivers/net/ar2313/ar2313.c
  	/* mask with MAC supported features */
  	phydev->supported &= (SUPPORTED_10baseT_Half
  		| SUPPORTED_10baseT_Full
-Index: linux-2.6.23.16/drivers/net/ar2313/ar2313.h
+Index: linux-2.6.23.17/drivers/net/ar2313/ar2313.h
 ===================================================================
---- linux-2.6.23.16.orig/drivers/net/ar2313/ar2313.h	2008-04-29 14:51:39.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/ar2313/ar2313.h	2008-04-29 14:52:15.000000000 +0200
-@@ -107,6 +107,8 @@
+--- linux-2.6.23.17.orig/drivers/net/ar2313/ar2313.h
++++ linux-2.6.23.17/drivers/net/ar2313/ar2313.h
+@@ -107,6 +107,8 @@ typedef struct {
   */
  struct ar2313_private {
  	struct net_device *dev;