Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / samsung / smdkv310 / mem_setup.S

diff --git a/board/samsung/smdkv310/mem_setup.S b/board/samsung/smdkv310/mem_setup.S
index d8c3ed4b383725fe4e056943770c770c4de4e061..73aebe3c60956a598b4b7e411310bc5d696aeaab 100644 (file)
--- a/board/samsung/smdkv310/mem_setup.S
+++ b/board/samsung/smdkv310/mem_setup.S
@@ -123,7 +123,7 @@ mem_ctrl_asm_init:
        ldr     r1, =0x00312640
        str     r1, [r0, #0x04]         @DMC_MEMCONTROL]
 
-#ifdef MIU_LINEAR
+#ifdef CONFIG_MIU_LINEAR
        ldr     r1, =0x40e01323
        str     r1, [r0, #0x08]         @DMC_MEMCONFIG0
        ldr     r1, =0x60e01323
@@ -255,7 +255,7 @@ mem_ctrl_asm_init:
        ldr     r1, =0x00312640
        str     r1, [r0, #0x04]         @DMC_MEMCONTROL]
 
-#ifdef MIU_LINEAR
+#ifdef CONFIG_MIU_LINEAR
        ldr     r1, =0x40e01323
        str     r1, [r0, #0x08]         @DMC_MEMCONFIG0
        ldr     r1, =0x60e01323