fix up mac address setting on ixp4xx for devices that store this info in the RedBoot...

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 017-nas100d_auto_power_on.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch
index b77df48..bf6bc07 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch
@@ -10,10 +10,10 @@ Also, update the board LED setup code to use constants.
 
 Signed-off-by: Rod Whitby <rod@whitby.id.au>
 
 
 Signed-off-by: Rod Whitby <rod@whitby.id.au>
 

-Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
+Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-power.c

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

---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-power.c    2008-01-11 16:59:20.000000000 +1030
-+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c 2008-01-11 17:03:23.000000000 +1030
+--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-power.c
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-power.c

 @@ -21,15 +21,61 @@
  #include <linux/irq.h>
  #include <linux/module.h>
 @@ -21,15 +21,61 @@
  #include <linux/irq.h>
  #include <linux/module.h>


@@ -80,7 +80,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
  
        return IRQ_HANDLED;
  }
  
        return IRQ_HANDLED;
  }

-@@ -39,17 +85,30 @@
+@@ -39,17 +85,30 @@ static int __init nas100d_power_init(voi

        if (!(machine_is_nas100d()))
                return 0;
  
        if (!(machine_is_nas100d()))
                return 0;
  


@@ -114,7 +114,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
        return 0;
  }
  
        return 0;
  }
  

-@@ -58,7 +117,9 @@
+@@ -58,7 +117,9 @@ static void __exit nas100d_power_exit(vo

        if (!(machine_is_nas100d()))
                return;
  
        if (!(machine_is_nas100d()))
                return;
  


@@ -125,10 +125,10 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
  }
  
  module_init(nas100d_power_init);
  }
  
  module_init(nas100d_power_init);

-Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h
+Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/nas100d.h

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

---- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/nas100d.h   2008-01-11 16:59:20.000000000 +1030
-+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h        2008-01-11 17:03:23.000000000 +1030
+--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/nas100d.h
++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/nas100d.h

 @@ -38,15 +38,15 @@
  
  /* Buttons */
 @@ -38,15 +38,15 @@
  
  /* Buttons */


@@ -154,11 +154,11 @@ Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h
 +#define NAS100D_LED_WLAN_GPIO 0
 +#define NAS100D_LED_DISK_GPIO 3
 +#define NAS100D_LED_PWR_GPIO  15
 +#define NAS100D_LED_WLAN_GPIO 0
 +#define NAS100D_LED_DISK_GPIO 3
 +#define NAS100D_LED_PWR_GPIO  15

-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-11 17:03:23.000000000 +1030
-+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-11 17:06:15.000000000 +1030
-@@ -44,20 +44,20 @@
+--- 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
+@@ -42,20 +42,20 @@ static struct platform_device nas100d_fl

  static struct resource nas100d_led_resources[] = {
        {
                .name           = "wlan",   /* green led */
  static struct resource nas100d_led_resources[] = {
        {
                .name           = "wlan",   /* green led */