From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Thu, 1 May 2008 00:13:44 +0000 (+0200)
Subject: pxa: fix previous definition on cpu init
X-Git-Tag: v1.3.3-rc3~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27c38689d0cfde0e444239345f97b5eecc9f4067;p=u-boot

pxa: fix previous definition on cpu init

start.S:183:1: warning: "ICMR" redefined
In file included from start.S:33:
include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
start.S:187:1: warning: "RCSR" redefined
...

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 31f408dfa7..1cdb7091d7 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -166,17 +166,13 @@ _start_armboot: .word start_armboot
 /*									    */
 /****************************************************************************/
 /* mk@tbd: Fix this! */
-#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS)
+#undef RCSR
 #undef ICMR
 #undef OSMR3
 #undef OSCR
 #undef OWER
 #undef OIER
-#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */
-#ifdef CONFIG_PXA250
-#undef RCSR
 #undef CCCR
-#endif /* CONFIG_PXA250 */
 
 /* Interrupt-Controller base address					    */
 IC_BASE:	   .word	   0x40d00000