X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-mxc%2Funcompress.h;h=42cc0cb3fefd40343ae2380cb9969d6ea2570f05;hb=9a4cd7a5c836e189a1712c9ffd2d76b2302ce212;hp=ec5787d0e78cac6c714b5b5347041a4749625a41;hpb=cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4;p=linux-2.6

diff --git a/include/asm-arm/arch-mxc/uncompress.h b/include/asm-arm/arch-mxc/uncompress.h
index ec5787d0e7..42cc0cb3fe 100644
--- a/include/asm-arm/arch-mxc/uncompress.h
+++ b/include/asm-arm/arch-mxc/uncompress.h
@@ -26,7 +26,6 @@
 #define __MXC_BOOT_UNCOMPRESS
 
 #include <asm/hardware.h>
-#include <asm/processor.h>
 
 #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
 
@@ -62,7 +61,7 @@ static void putc(int ch)
 	}
 
 	while (!(UART(USR2) & USR2_TXFE))
-		cpu_relax();
+		barrier();
 
 	UART(TXR) = ch;
 }