Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-omap2 / gpmc.c

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 8d70bd0..e4b16c8 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -790,9 +790,6 @@ static int gpmc_mem_init(void)
         * even if we didn't boot from ROM.
         */
        boot_rom_space = BOOT_ROM_SPACE;
-       /* In apollon the CS0 is mapped as 0x0000 0000 */
-       if (machine_is_omap_apollon())
-               boot_rom_space = 0;
        gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
        gpmc_mem_root.end = GPMC_MEM_END;