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 | |
| parent | bf0098f22ca7b59e8844ac6882bbae230d34b98d (diff) | |
| parent | 38141fcfaad34a388e61a7a7e98d521330e049d6 (diff) | |
| download | linux-3.10-5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2.tar.gz linux-3.10-5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2.tar.bz2 linux-3.10-5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/bcm47xx/nvram.c | 4 | ||||
| -rw-r--r-- | arch/mips/bcm47xx/wgt634u.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index d43ceff5be4..48a4c70b384 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 diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c index e9f9ec8d443..e80d585731a 100644 --- a/arch/mips/bcm47xx/wgt634u.c +++ b/arch/mips/bcm47xx/wgt634u.c @@ -156,10 +156,10 @@ static int __init wgt634u_init(void) SSB_CHIPCO_IRQ_GPIO); } - wgt634u_flash_data.width = mcore->flash_buswidth; - wgt634u_flash_resource.start = mcore->flash_window; - wgt634u_flash_resource.end = mcore->flash_window - + mcore->flash_window_size + wgt634u_flash_data.width = mcore->pflash.buswidth; + wgt634u_flash_resource.start = mcore->pflash.window; + wgt634u_flash_resource.end = mcore->pflash.window + + mcore->pflash.window_size - 1; return platform_add_devices(wgt634u_devices, ARRAY_SIZE(wgt634u_devices)); |