From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Tue, 18 Dec 2007 01:33:01 +0000 (+0900)
Subject: ARM: OMAP: Remove undefined CONFIG_ARCH_OMAP242X
X-Git-Tag: v2.6.24-omap1~76
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84a0cb7da8c222b3bf1beac6adea6708d4b8143a;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Remove undefined CONFIG_ARCH_OMAP242X

Remove undefined CONFIG_ARCH_OMAP242X.
It boots on locked SRAM board.

Comment from Tony.
Additionally the #if defined(CONFIG_ARCH_OMAP242X) should not be
needed here. If not selected, the cpu_is_omapxxxx() functions
are if (0) {} functions and get optimized out.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index afe81815fed..c377cb0ba5a 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -91,11 +91,9 @@ static int is_sram_locked(void)
 {
 	int type = 0;
 
-#if defined(CONFIG_ARCH_OMAP242X)
 	if (cpu_is_omap242x())
 		type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
 			OMAP2_DEVICETYPE_MASK);
-#endif
 
 	if (type == GP_DEVICE) {
 		/* RAMFW: R/W access to all initiators for all qualifier sets */