From: Ralf Baechle Date: Thu, 25 Oct 2012 19:14:59 +0000 (+0200) Subject: MIPS: Octeon: Remove use of CONFIG_64BIT_PHYS_ADDR. X-Git-Tag: v3.8-rc1~109^2~31 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4fe64af7da539bc58c9e571da5ef0eb4589c9a35;p=linux.git 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 --- 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,