enable AMD flash support and physmap on orion

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 032-ixp4xx-net-drivers-nas100d.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch
index 1434733..656c83e 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c    2008-01-08 15:22:07.000000000 +1030
-+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-08 15:32:32.000000000 +1030
+--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c

 @@ -21,6 +21,7 @@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
 @@ -21,6 +21,7 @@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>


@@ -10,7 +10,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
  
  static struct flash_platform_data nas100d_flash_data = {
        .map_name               = "cfi_probe",
  
  static struct flash_platform_data nas100d_flash_data = {
        .map_name               = "cfi_probe",

-@@ -125,12 +126,30 @@
+@@ -125,12 +126,30 @@ static struct platform_device nas100d_ua

        .resource               = nas100d_uart_resources,
  };
  
        .resource               = nas100d_uart_resources,
  };
  


@@ -41,7 +41,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
  };
  
  static void nas100d_power_off(void)
  };
  
  static void nas100d_power_off(void)

-@@ -146,6 +165,9 @@
+@@ -146,6 +165,9 @@ static void nas100d_power_off(void)

  
  static void __init nas100d_init(void)
  {
  
  static void __init nas100d_init(void)
  {


@@ -51,7 +51,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
        ixp4xx_sys_init();
  
        /* gpio 14 and 15 are _not_ clocks */
        ixp4xx_sys_init();
  
        /* gpio 14 and 15 are _not_ clocks */

-@@ -165,6 +187,33 @@
+@@ -165,6 +187,33 @@ static void __init nas100d_init(void)

        (void)platform_device_register(&nas100d_uart);
  
        platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
        (void)platform_device_register(&nas100d_uart);
  
        platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));