Combined the nslu2 net driver patches, based on new nslu2-linux patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10165 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 37 insertions, 41 deletions

diff --git a/target/linux/ixp4xx/patches-2.6.23/066-nslu2_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch
index 93f3c2ee0..d4c710c04 100644
--- a/target/linux/ixp4xx/patches-2.6.23/066-nslu2_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
 ===================================================================
---- linux-2.6.23.11-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-12-29 01:46:05.000000000 -0600
-+++ linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-12-29 12:21:29.000000000 -0600
+--- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c	2008-01-08 15:28:13.000000000 +1030
++++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c	2008-01-08 15:28:32.000000000 +1030
 @@ -24,6 +24,7 @@
  #include <asm/mach/arch.h>
  #include <asm/mach/flash.h>
@@ -10,7 +10,39 @@ Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
  
  static struct flash_platform_data nslu2_flash_data = {
  	.map_name		= "cfi_probe",
-@@ -193,6 +194,9 @@
+@@ -140,6 +141,23 @@
+ 	.resource		= nslu2_uart_resources,
+ };
+ 
++/* Built-in 10/100 Ethernet MAC interfaces */
++static struct eth_plat_info nslu2_plat_eth[] = {
++	{
++		.phy		= 1,
++		.rxq		= 3,
++		.txreadyq	= 20,
++	}
++};
++
++static struct platform_device nslu2_eth[] = {
++	{
++		.name			= "ixp4xx_eth",
++		.id			= IXP4XX_ETH_NPEB,
++		.dev.platform_data	= nslu2_plat_eth,
++	}
++};
++
+ static struct platform_device *nslu2_devices[] __initdata = {
+ 	&nslu2_i2c_gpio,
+ 	&nslu2_flash,
+@@ -147,6 +165,7 @@
+ #ifdef CONFIG_LEDS_IXP4XX
+ 	&nslu2_leds,
+ #endif
++	&nslu2_eth[0],
+ };
+ 
+ static void nslu2_power_off(void)
+@@ -175,6 +194,9 @@
  
  static void __init nslu2_init(void)
  {
@@ -20,7 +52,7 @@ Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
  	ixp4xx_sys_init();
  
  	nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-@@ -209,6 +213,33 @@
+@@ -191,6 +213,33 @@
  	(void)platform_device_register(&nslu2_uart);
  
  	platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
diff --git a/target/linux/ixp4xx/patches-2.6.23/051-nslu2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/051-nslu2_mac_plat_info.patch
deleted file mode 100644
index f6b9a385f..000000000
--- a/target/linux/ixp4xx/patches-2.6.23/051-nslu2_mac_plat_info.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
-index 77277d2..e0d0dde 100644
---- a/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
-@@ -140,6 +140,23 @@ static struct platform_device nslu2_uart = {
- 	.resource		= nslu2_uart_resources,
- };
- 
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info nslu2_plat_eth[] = {
-+	{
-+		.phy		= 1,
-+		.rxq		= 3,
-+		.txreadyq	= 20,
-+	}
-+};
-+
-+static struct platform_device nslu2_eth[] = {
-+	{
-+		.name			= "ixp4xx_eth",
-+		.id			= IXP4XX_ETH_NPEB,
-+		.dev.platform_data	= nslu2_plat_eth,
-+	}
-+};
-+
- static struct platform_device *nslu2_devices[] __initdata = {
- 	&nslu2_i2c_gpio,
- 	&nslu2_flash,
-@@ -147,6 +164,7 @@ static struct platform_device *nslu2_devices[] __initdata = {
- #ifdef CONFIG_LEDS_IXP4XX
- 	&nslu2_leds,
- #endif
-+	&nslu2_eth[0],
- };
- 
- static void nslu2_power_off(void)