[brcm63xx] re-instate SPI support
[openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 100-reset_buttons.patch
index ba6518611aacc8e23630717d229588d855499639..8c9bcc6dbe31779e48c09e97e567b22e93f9e595 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
-===================================================================
---- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c      2010-02-28 18:37:27.000000000 +0100
-+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c   2010-02-28 18:41:36.000000000 +0100
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 @@ -15,6 +15,8 @@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
@@ -11,7 +9,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -288,6 +290,16 @@
+@@ -288,6 +290,16 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },
@@ -28,7 +26,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
  };
  
  static struct board_info __initdata board_96348gw = {
-@@ -345,6 +357,16 @@
+@@ -345,6 +357,16 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },
@@ -45,7 +43,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
  };
  
  static struct board_info __initdata board_FAST2404 = {
-@@ -771,6 +793,16 @@
+@@ -771,6 +793,16 @@ static struct platform_device bcm63xx_gp
        .dev.platform_data      = &bcm63xx_led_data,
  };
  
@@ -62,7 +60,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
  /*
   * third stage init callback, register all board devices.
   */
-@@ -826,6 +858,13 @@
+@@ -826,6 +858,13 @@ int __init board_register_devices(void)
  
        platform_device_register(&bcm63xx_gpio_leds);
  
@@ -76,11 +74,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
        return 0;
  }
  
-Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-===================================================================
---- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h    2010-02-28 18:36:33.000000000 +0100
-+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:36:58.000000000 +0100
-@@ -55,6 +55,9 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -55,6 +55,9 @@ struct board_info {
  
        /* GPIO LEDs */
        struct gpio_led leds[5];