mvsmr: fix link error

MVSMR board support doesn't link since recent rework
of U-Boot directory structure. Fix it now.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Fixed merge conflict
Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds
index 3e917a99c2eb588432d9e154f93fa02d18374d8d..f9b103e6175ed14ccd52fda22258620958fb9c41 100644 (file)
--- a/board/matrix_vision/mvsmr/u-boot.lds
+++ b/board/matrix_vision/mvsmr/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
   {
     /* WARNING - the following is hand-optimized to fit within  */
     /* the first two sectors (=8KB) of our S29GL flash chip */
-    arch/powerpc/cpu/mpc5xxx/start.o          (.text)
-    arch/powerpc/cpu/mpc5xxx/traps.o          (.text)
-    lib/crc32.o         (.text)
-    arch/powerpc/lib/cache.o             (.text)
-    arch/powerpc/lib/time.o              (.text)
+    arch/powerpc/cpu/mpc5xxx/start.o   (.text)
+    arch/powerpc/cpu/mpc5xxx/traps.o   (.text)
+    lib/crc32.o                                (.text)
+    arch/powerpc/lib/cache.o           (.text)
+    arch/powerpc/lib/time.o            (.text)
 
     /* This is only needed to force failure if size of above code will ever */
     /* increase and grow into reserved space. */