diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 13:33:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 13:33:43 -0500 |
| commit | 5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2 (patch) | |
| tree | 1547396386999c30cb6bd6768d1ba6dc1926ff2a /arch/mips/bcm47xx/nvram.c | |
| parent | bf0098f22ca7b59e8844ac6882bbae230d34b98d (diff) | |
| parent | 38141fcfaad34a388e61a7a7e98d521330e049d6 (diff) | |
| download | op-kernel-dev-5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2.zip op-kernel-dev-5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'arch/mips/bcm47xx/nvram.c')
| -rw-r--r-- | arch/mips/bcm47xx/nvram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index d43ceff..48a4c70 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -43,8 +43,8 @@ static void early_nvram_init(void) #ifdef CONFIG_BCM47XX_SSB case BCM47XX_BUS_TYPE_SSB: mcore_ssb = &bcm47xx_bus.ssb.mipscore; - base = mcore_ssb->flash_window; - lim = mcore_ssb->flash_window_size; + base = mcore_ssb->pflash.window; + lim = mcore_ssb->pflash.window_size; break; #endif #ifdef CONFIG_BCM47XX_BCMA |
