diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-25 21:14:59 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-12 16:52:06 +0100 |
| commit | 4fe64af7da539bc58c9e571da5ef0eb4589c9a35 (patch) | |
| tree | 8311c6f153d8c7ad2ddd27bca20083bc1fe71329 /arch | |
| parent | MIPS: Octeon: Remove highmem code. (diff) | |
| download | linux-4fe64af7da539bc58c9e571da5ef0eb4589c9a35.tar.xz linux-4fe64af7da539bc58c9e571da5ef0eb4589c9a35.zip | |
MIPS: Octeon: Remove use of CONFIG_64BIT_PHYS_ADDR.
Only supporting 64-bit kernels there is no point in depending on
this symbol.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index efc1ed404b51..c0c2d14be423 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -666,7 +666,7 @@ void __init plat_mem_setup(void) cvmx_bootmem_lock(); while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX) && (total < MAX_MEMORY)) { -#if defined(CONFIG_64BIT) || defined(CONFIG_64BIT_PHYS_ADDR) +#ifdef CONFIG_64BIT memory = cvmx_bootmem_phy_alloc(mem_alloc_size, __pa_symbol(&__init_end), -1, 0x100000, |