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>
This commit is contained in:
parent
6d12e697de
commit
27c38689d0
|
@ -166,17 +166,13 @@ _start_armboot: .word start_armboot
|
||||||
/* */
|
/* */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* mk@tbd: Fix this! */
|
/* mk@tbd: Fix this! */
|
||||||
#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS)
|
#undef RCSR
|
||||||
#undef ICMR
|
#undef ICMR
|
||||||
#undef OSMR3
|
#undef OSMR3
|
||||||
#undef OSCR
|
#undef OSCR
|
||||||
#undef OWER
|
#undef OWER
|
||||||
#undef OIER
|
#undef OIER
|
||||||
#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */
|
|
||||||
#ifdef CONFIG_PXA250
|
|
||||||
#undef RCSR
|
|
||||||
#undef CCCR
|
#undef CCCR
|
||||||
#endif /* CONFIG_PXA250 */
|
|
||||||
|
|
||||||
/* Interrupt-Controller base address */
|
/* Interrupt-Controller base address */
|
||||||
IC_BASE: .word 0x40d00000
|
IC_BASE: .word 0x40d00000
|
||||||
|
|
Loading…
Reference in New Issue