uClibc: fix ubicom32 compile error with 0.9.32

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

diff --git a/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch
index 2b812a3..afaea44 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
-       return 1;
+@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val,
+       return NVRAM_ERR_ENVNOTFOUND;
  }
  EXPORT_SYMBOL(nvram_getenv);
 +
@@ -20,7 +20,8 @@
 +      end = nvram_buf + sizeof(nvram_buf) - 2;
 +      end[0] = end[1] = '\0';
 +      for (; *var; var = value + strlen(value) + 1) {
-+              if (!(eq = strchr(var, '=')))
++              eq = strchr(var, '=');
++              if (!eq)
 +                      break;
 +              value = eq + 1;
 +              if ((eq - var) == strlen(name) && strncmp(var, name, (eq - var)) == 0)
@@ -29,11 +30,10 @@
 +
 +      return NULL;
 +}
-+
 +EXPORT_SYMBOL(nvram_get);
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
+@@ -238,3 +238,20 @@ void __init plat_mem_setup(void)
        _machine_halt = bcm47xx_machine_halt;
        pm_power_off = bcm47xx_machine_halt;
  }