commit 21856468d6c71e5a963f3887f735b48717cdc02b
author Wolfgang Denk <wd@denx.de> Tue Oct 19 21:07:52 2010 +0200
committer Wolfgang Denk <wd@denx.de> Tue Oct 19 21:07:52 2010 +0200
tree a6a58200f5ea04c6d4ad2260dd031fcc6e4183ce
parent 8cc3b771a6fc8452c35344ce720df8d579493941
parent 429ddf69bb8a81c591c9de41957e911cd0719577

Merge branch 'elf_reloc'

Conflicts:
	arch/arm/include/asm/config.h
	board/LaCie/edminiv2/config.mk
	board/karo/tx25/config.mk
	board/logicpd/imx27lite/config.mk
	doc/README.arm-relocation

Signed-off-by: Wolfgang Denk <wd@denx.de>

arch/arm/include/asm/config.h

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index d8e33fc..4124f0a 100644
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -21,10 +21,9 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 /* Relocation to SDRAM works on all ARM boards */
 #define CONFIG_RELOC_FIXUP_WORKS
-#endif
+
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 #endif