brcm47xx: add a new version of the nvram rewrite patch

[openwrt/svn-archive/archive.git] / package / switch / src / switch-robo.c

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index f1160c8894a160389f9c4e9780fe5153e3256159..3751653a6d95fa95b9c54a82b68d6aa117a0cc9c 100644 (file)
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -35,7 +35,7 @@
 #include "etc53xx.h"
 
 #ifdef CONFIG_BCM47XX
 #include "etc53xx.h"
 
 #ifdef CONFIG_BCM47XX

-#include <nvram.h>
+#include <bcm47xx_nvram.h>

 #endif
 
 #define DRIVER_NAME            "bcm53xx"
 #endif
 
 #define DRIVER_NAME            "bcm53xx"


@@ -236,7 +236,7 @@ static int robo_switch_enable(void)
 
 #ifdef CONFIG_BCM47XX
        /* WAN port LED, except for Netgear WGT634U */
 
 #ifdef CONFIG_BCM47XX
        /* WAN port LED, except for Netgear WGT634U */

-       if (nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) {
+       if (bcm47xx_nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) {

                if (strcmp(buf, "cfe") != 0)
                        robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
        }
                if (strcmp(buf, "cfe") != 0)
                        robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
        }