brcm47xx: update bcma and ssb to master-2011-07-21

[librecmc/librecmc.git] / target / linux / brcm47xx / patches-3.0 / 400-arch-bcm47xx.patch

diff --git a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
index 8e5e88b6ba2ebe3fa323b6ebf7e9f24b2162cb72..fe23dc61cd665e95e6f47b025f69bdfd759edf9f 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -114,3 +114,30 @@ int nvram_getenv(char *name, char *val,
+@@ -117,3 +117,30 @@ int nvram_getenv(char *name, char *val,
        return NVRAM_ERR_ENVNOTFOUND;
  }
  EXPORT_SYMBOL(nvram_getenv);
@@ -33,10 +33,10 @@
 +EXPORT_SYMBOL(nvram_get);
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -388,3 +388,20 @@ static int __init bcm47xx_register_bus_c
+@@ -438,3 +438,20 @@ static int __init bcm47xx_register_flash
        return 0;
  }
- device_initcall(bcm47xx_register_bus_complete);
+ fs_initcall(bcm47xx_register_flash);
 +
 +static int __init bcm47xx_register_gpiodev(void)
 +{