brcm47xx: reorder patches so that the patches already in mainline linux will be appli...

[openwrt.git] / target / linux / brcm47xx / patches-3.3 / 400-arch-bcm47xx.patch

diff --git a/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch
index 0933fb69596bfef72aab554cf380a666b0bd67d7..c3c7aea54148787ea7a96fd47b007eef3c8a3f4c 100644 (file)
--- a/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-3.3/400-arch-bcm47xx.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -269,3 +269,30 @@ int nvram_getenv(char *name, char *val,
+@@ -274,3 +274,30 @@ int nvram_getenv(char *name, char *val,
        return NVRAM_ERR_ENVNOTFOUND;
  }
  EXPORT_SYMBOL(nvram_getenv);
@@ -33,7 +33,7 @@
 +EXPORT_SYMBOL(nvram_get);
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -384,3 +384,20 @@ static int __init bcm47xx_register_flash
+@@ -379,3 +379,20 @@ static int __init bcm47xx_register_flash
        return -1;
  }
  fs_initcall(bcm47xx_register_flash);