Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-mxs / Makefile.boot

diff --git a/arch/arm/mach-mxs/Makefile.boot b/arch/arm/mach-mxs/Makefile.boot
index eb541e0291daddd2cd685e16abfa228b425d2ed9..07b11fe6453f525bc43fc15cf32694388188f0c7 100644 (file)
--- a/arch/arm/mach-mxs/Makefile.boot
+++ b/arch/arm/mach-mxs/Makefile.boot
@@ -1 +1 @@
-zreladdr-y := 0x40008000
+zreladdr-y += 0x40008000