diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 19:20:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-08 14:29:31 -0400 |
commit | a656ffcbc7a98a80d2136ae6bbdd8ae2eb48c78a (patch) | |
tree | 9b732b9a15ad8cc9c8790f36f3ac9a00bf6972c2 /arch/mips/bcm47xx/nvram.c | |
parent | 08ccf57283f89adbc2ff897ad82d6ad4560db7cd (diff) |
bcm47xx: make it possible to build bcm47xx without ssb.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'arch/mips/bcm47xx/nvram.c')
-rw-r--r-- | arch/mips/bcm47xx/nvram.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index bcac2ffd1248..4e994edb1425 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c | |||
@@ -26,7 +26,9 @@ static char nvram_buf[NVRAM_SPACE]; | |||
26 | /* Probe for NVRAM header */ | 26 | /* Probe for NVRAM header */ |
27 | static void early_nvram_init(void) | 27 | static void early_nvram_init(void) |
28 | { | 28 | { |
29 | #ifdef CONFIG_BCM47XX_SSB | ||
29 | struct ssb_mipscore *mcore_ssb; | 30 | struct ssb_mipscore *mcore_ssb; |
31 | #endif | ||
30 | struct nvram_header *header; | 32 | struct nvram_header *header; |
31 | int i; | 33 | int i; |
32 | u32 base = 0; | 34 | u32 base = 0; |
@@ -35,11 +37,13 @@ static void early_nvram_init(void) | |||
35 | u32 *src, *dst; | 37 | u32 *src, *dst; |
36 | 38 | ||
37 | switch (bcm47xx_bus_type) { | 39 | switch (bcm47xx_bus_type) { |
40 | #ifdef CONFIG_BCM47XX_SSB | ||
38 | case BCM47XX_BUS_TYPE_SSB: | 41 | case BCM47XX_BUS_TYPE_SSB: |
39 | mcore_ssb = &bcm47xx_bus.ssb.mipscore; | 42 | mcore_ssb = &bcm47xx_bus.ssb.mipscore; |
40 | base = mcore_ssb->flash_window; | 43 | base = mcore_ssb->flash_window; |
41 | lim = mcore_ssb->flash_window_size; | 44 | lim = mcore_ssb->flash_window_size; |
42 | break; | 45 | break; |
46 | #endif | ||
43 | } | 47 | } |
44 | 48 | ||
45 | off = FLASH_MIN; | 49 | off = FLASH_MIN; |