kernel: sort Kconfig options in kernel configs

[oweals/openwrt.git] / target / linux / brcm63xx / patches-3.10 / 501-board-NB4.patch

diff --git a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
index f9f45475d4506aebcf31ffa2588520c99814f304..5f16bb5b2a66ff946b7cd6c9504611dc52cd0409 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
@@ -1,15 +1,17 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -15,6 +15,8 @@
+@@ -12,6 +12,10 @@
+ #include <linux/string.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
- #include <linux/spi/spi.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
 +#include <linux/spi/spi_gpio.h>
 +#include <linux/spi/74x164.h>
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -49,6 +51,12 @@
+@@ -35,6 +39,12 @@
  #define CFE_OFFSET_64K                        0x10000
  #define CFE_OFFSET_128K                       0x20000
  
@@ -19,10 +21,10 @@
 +#define NB4_SPI_GPIO_CLK      6
 +#define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
 +
- static struct board_info board;
- 
  /*
-@@ -755,6 +763,596 @@ static struct board_info __initdata boar
+  * known 3368 boards
+  */
+@@ -739,6 +749,601 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -87,6 +89,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -200,6 +203,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -313,6 +317,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -426,6 +431,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -534,6 +540,7 @@
 +      .has_ohci0 = 1,
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
 +
 +      .leds = {
 +              {
@@ -619,7 +626,7 @@
  #endif
  
  /*
-@@ -791,6 +1389,11 @@ static const struct board_info __initcon
+@@ -775,6 +1380,11 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -631,7 +638,7 @@
  #endif
  };
  
-@@ -845,6 +1448,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -783,6 +1393,16 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();