diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/b44.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 219f6226fcb1..330b0908bf97 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
@@ -381,7 +381,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote) | |||
381 | } | 381 | } |
382 | 382 | ||
383 | #ifdef CONFIG_BCM47XX | 383 | #ifdef CONFIG_BCM47XX |
384 | #include <asm/mach-bcm47xx/nvram.h> | 384 | #include <bcm47xx_nvram.h> |
385 | static void b44_wap54g10_workaround(struct b44 *bp) | 385 | static void b44_wap54g10_workaround(struct b44 *bp) |
386 | { | 386 | { |
387 | char buf[20]; | 387 | char buf[20]; |
@@ -393,7 +393,7 @@ static void b44_wap54g10_workaround(struct b44 *bp) | |||
393 | * see https://dev.openwrt.org/ticket/146 | 393 | * see https://dev.openwrt.org/ticket/146 |
394 | * check and reset bit "isolate" | 394 | * check and reset bit "isolate" |
395 | */ | 395 | */ |
396 | if (nvram_getenv("boardnum", buf, sizeof(buf)) < 0) | 396 | if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) < 0) |
397 | return; | 397 | return; |
398 | if (simple_strtoul(buf, NULL, 0) == 2) { | 398 | if (simple_strtoul(buf, NULL, 0) == 2) { |
399 | err = __b44_readphy(bp, 0, MII_BMCR, &val); | 399 | err = __b44_readphy(bp, 0, MII_BMCR, &val); |