diff options
Diffstat (limited to 'arch/mips/bcm47xx/setup.c')
-rw-r--r-- | arch/mips/bcm47xx/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 4d54b58dbd32..b2246cd9ca12 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <asm/reboot.h> | 35 | #include <asm/reboot.h> |
36 | #include <asm/time.h> | 36 | #include <asm/time.h> |
37 | #include <bcm47xx.h> | 37 | #include <bcm47xx.h> |
38 | #include <asm/mach-bcm47xx/nvram.h> | 38 | #include <bcm47xx_nvram.h> |
39 | 39 | ||
40 | union bcm47xx_bus bcm47xx_bus; | 40 | union bcm47xx_bus bcm47xx_bus; |
41 | EXPORT_SYMBOL(bcm47xx_bus); | 41 | EXPORT_SYMBOL(bcm47xx_bus); |
@@ -115,7 +115,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, | |||
115 | memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); | 115 | memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); |
116 | bcm47xx_fill_sprom(&iv->sprom, NULL, false); | 116 | bcm47xx_fill_sprom(&iv->sprom, NULL, false); |
117 | 117 | ||
118 | if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) | 118 | if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) |
119 | iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); | 119 | iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); |
120 | 120 | ||
121 | return 0; | 121 | return 0; |
@@ -138,7 +138,7 @@ static void __init bcm47xx_register_ssb(void) | |||
138 | panic("Failed to initialize SSB bus (err %d)", err); | 138 | panic("Failed to initialize SSB bus (err %d)", err); |
139 | 139 | ||
140 | mcore = &bcm47xx_bus.ssb.mipscore; | 140 | mcore = &bcm47xx_bus.ssb.mipscore; |
141 | if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { | 141 | if (bcm47xx_nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { |
142 | if (strstr(buf, "console=ttyS1")) { | 142 | if (strstr(buf, "console=ttyS1")) { |
143 | struct ssb_serial_port port; | 143 | struct ssb_serial_port port; |
144 | 144 | ||