---

yaml --- r: 36623 b: refs/heads/master c: d1284b5 h: refs/heads/master i: 36621: 5ea04a8 36619: da94661 36615: 14d387d 36607: 5f6cd71 v: v3
git-mirror · Sep 25, 2006 · edcfa2b · edcfa2b
1 parent a6fd0b5
commit edcfa2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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);
 	}