diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-01-03 01:53:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-01-03 01:53:30 +0000 |
| commit | 880dc8381a3948b0c49610a3e36add1a91e7f06b (patch) | |
| tree | 80c467f23a4f364b9be69716075cd3b186161e62 /package/system/rtc-rv5c386a | |
| parent | 979291e9c5a2acd6c9942bbb8b846f07ec0d6050 (diff) | |
| download | upstream-880dc8381a3948b0c49610a3e36add1a91e7f06b.tar.gz upstream-880dc8381a3948b0c49610a3e36add1a91e7f06b.tar.bz2 upstream-880dc8381a3948b0c49610a3e36add1a91e7f06b.zip | |
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34988 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/rtc-rv5c386a')
| -rw-r--r-- | package/system/rtc-rv5c386a/src/rtc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/system/rtc-rv5c386a/src/rtc.c b/package/system/rtc-rv5c386a/src/rtc.c index 25e5331409..2fc6f093cf 100644 --- a/package/system/rtc-rv5c386a/src/rtc.c +++ b/package/system/rtc-rv5c386a/src/rtc.c @@ -62,7 +62,7 @@ #endif #include <bcm47xx.h> -#include <nvram.h> +#include <bcm47xx_nvram.h> #define RTC_IS_OPEN 0x01 /* Means /dev/rtc is in use. */ @@ -530,7 +530,7 @@ static void platform_detect(void) int et0phyaddr, et1phyaddr; /* Based on "model_no". */ - if (nvram_getenv("model_no", buf, sizeof(buf)) >= 0) { + if (bcm47xx_nvram_getenv("model_no", buf, sizeof(buf)) >= 0) { if (startswith(buf, "WL700")) { /* WL700* */ sda_index = 2; scl_index = 5; @@ -538,12 +538,12 @@ static void platform_detect(void) } } - if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ) + if (bcm47xx_nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ) et0phyaddr = simple_strtoul(buf, NULL, 0); - if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ) + if (bcm47xx_nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ) et1phyaddr = simple_strtoul(buf, NULL, 0); - if (nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0) { + if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0) { /* Either WL-300g or WL-HDD, do more extensive checks */ if (startswith(buf, "WL300-") && et0phyaddr == 0 && et1phyaddr == 1) { sda_index = 4; |