From edcfa2b824e6510409bcda0390f902847bcb5740 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 25 Sep 2006 12:41:24 +0300 Subject: [PATCH] --- yaml --- r: 36623 b: refs/heads/master c: d1284b5f11aa946d732d60a402dfeec86a7bb2ef h: refs/heads/master i: 36621: 5ea04a870660f83ce8a82ea138b2f2768bca2d92 36619: da94661476b7aca4720bb41673e8bcde59908f06 36615: 14d387d4219757dfa1fff01ceb6efddee102a9d3 36607: 5f6cd71c46a185cacd398ded85c1830d0152902d v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/sram.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4e86f8276bc8..afc13a444056 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93bda4c0214441b0bb03b61c2bf1d6727896a750 +refs/heads/master: d1284b5f11aa946d732d60a402dfeec86a7bb2ef diff --git a/trunk/arch/arm/plat-omap/sram.c b/trunk/arch/arm/plat-omap/sram.c index e75718301b0f..19014b2ff4c6 100644 --- a/trunk/arch/arm/plat-omap/sram.c +++ b/trunk/arch/arm/plat-omap/sram.c @@ -174,10 +174,7 @@ void __init omap_map_sram(void) if (cpu_is_omap24xx()) { omap_sram_io_desc[0].virtual = OMAP2_SRAM_VA; - if (is_sram_locked()) - base = OMAP2_SRAM_PUB_PA; - else - base = OMAP2_SRAM_PA; + base = OMAP2_SRAM_PA; base = ROUND_DOWN(base, PAGE_SIZE); omap_sram_io_desc[0].pfn = __phys_to_pfn(base); }