[kernel] generic-2.6: revert yaffs changes [11378], the new code is not working corre...

[openwrt.git] / target / linux / ixp4xx / patches / 430-pronghorn_metro_cf.patch

diff --git a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
index d2982bc..be5e7a5 100644 (file)
--- a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
+++ b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:31:27.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c    2007-06-10 14:36:23.000000000 +0200
-@@ -77,6 +77,35 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -77,6 +77,35 @@ static struct platform_device pronghornm

        .resource       = &pronghornmetro_uart_resource,
  };
  
        .resource       = &pronghornmetro_uart_resource,
  };
  


@@ -37,7 +38,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2
  static struct resource res_mac0 = {
        .start          = IXP4XX_EthB_BASE_PHYS,
        .end            = IXP4XX_EthB_BASE_PHYS + 0x1ff,
  static struct resource res_mac0 = {
        .start          = IXP4XX_EthB_BASE_PHYS,
        .end            = IXP4XX_EthB_BASE_PHYS + 0x1ff,

-@@ -165,6 +194,17 @@
+@@ -165,6 +194,17 @@ static void __init pronghornmetro_init(v

  
        platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
  
  
        platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));