Merge branch 'depends/rmk/memory_h' into next/cleanup2

[karo-tx-linux.git] / arch / arm / mach-s3c64xx / mach-smdk6400.c

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index fc7cb03e188d65b67150b6574a42a2f5bc8674d9..73450c2b530a661b131bf9e9e3824f7423ee94ba 100644 (file)
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -85,7 +85,7 @@ static void __init smdk6400_machine_init(void)
 
 MACHINE_START(SMDK6400, "SMDK6400")
        /* Maintainer: Ben Dooks <ben-linux@fluff.org> */
-       .boot_params    = S3C64XX_PA_SDRAM + 0x100,
+       .atag_offset    = 0x100,
 
        .init_irq       = s3c6400_init_irq,
        .map_io         = smdk6400_map_io,