Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / arch / powerpc / cpu / mpc85xx / u-boot.lds

diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 8c6e66ec1b5cb8932e457092a1ce3c1c4c4386d2..0503dce5ae4345edf6221b8d169720c05c5231e3 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -127,6 +127,6 @@ SECTIONS
   } :bss
 
   . = ALIGN(4);
-  __bss_end__ = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }