bcm63xx: update patches to latest upstream versions

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch

diff --git a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
index 4afbe23..db1891c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
+++ b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
@@ -20,10 +20,10 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 @@ -1,6 +1,6 @@
 -obj-y         += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
 -                 dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o dev-pcmcia.o \
--                 dev-spi.o dev-trng.o dev-uart.o dev-usb-ehci.o \
+-                 dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
 +obj-y         += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o setup.o \
 +                 timer.o dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o \
-+                 dev-pcmcia.o dev-spi.o dev-trng.o dev-uart.o dev-usb-ehci.o \
++                 dev-pcmcia.o dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
                   dev-usb-ohci.o dev-wdt.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
  
@@ -125,7 +125,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        u32 val;
  
        /* read base address of boot chip select (0)
-@@ -783,32 +749,19 @@ void __init board_prom_init(void)
+@@ -784,32 +750,19 @@ void __init board_prom_init(void)
                strcpy(cfe_version, "unknown");
        printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
  
@@ -162,7 +162,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                        continue;
                /* copy, board desc array is marked initdata */
                memcpy(&board, bcm963xx_boards[i], sizeof(board));
-@@ -818,7 +771,7 @@ void __init board_prom_init(void)
+@@ -819,7 +772,7 @@ void __init board_prom_init(void)
        /* bail out if board is not found, will complain later */
        if (!board.name[0]) {
                char name[17];
@@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                name[16] = 0;
                printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
                       name);
-@@ -910,15 +863,15 @@ int __init board_register_devices(void)
+@@ -912,15 +865,15 @@ int __init board_register_devices(void)
                bcm63xx_pcmcia_register();
  
        if (board.has_enet0 &&
@@ -190,7 +190,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                bcm63xx_enetsw_register(&board.enetsw);
  
        if (board.has_ehci0)
-@@ -934,7 +887,7 @@ int __init board_register_devices(void)
+@@ -936,7 +889,7 @@ int __init board_register_devices(void)
         * do this after registering enet devices
         */
  #ifdef CONFIG_SSB_PCIHOST