aboutsummaryrefslogtreecommitdiffstats
path: root/package/system/rtc-rv5c386a/src
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-03 01:53:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-03 01:53:30 +0000
commit25afeba608b9db64cc0cab1f7be790f64193f590 (patch)
treef293f93d06a2a30ce21d64d2a64763ba7bbd4e6c /package/system/rtc-rv5c386a/src
parentedc7ab525ff7cc45ea478b8b936e596789eb851a (diff)
downloadupstream-25afeba608b9db64cc0cab1f7be790f64193f590.tar.gz
upstream-25afeba608b9db64cc0cab1f7be790f64193f590.tar.bz2
upstream-25afeba608b9db64cc0cab1f7be790f64193f590.zip
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion. SVN-Revision: 34988
Diffstat (limited to 'package/system/rtc-rv5c386a/src')
-rw-r--r--package/system/rtc-rv5c386a/src/rtc.c10
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;