Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / arm / mach-s5p64x0 / Makefile.boot

diff --git a/arch/arm/mach-s5p64x0/Makefile.boot b/arch/arm/mach-s5p64x0/Makefile.boot
index ff90aa13bd674b6befc96089b4c2097c101d1de4..79ece4055b0206299c562c54583ad61dacdf7dae 100644 (file)
--- a/arch/arm/mach-s5p64x0/Makefile.boot
+++ b/arch/arm/mach-s5p64x0/Makefile.boot
@@ -1,2 +1,2 @@
-   zreladdr-y  := 0x20008000
+   zreladdr-y  += 0x20008000
 params_phys-y  := 0x20000100