From d24c86bb5238289a6d315659eca6b82f7008da90 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 20 Jul 2007 02:07:31 +0100
Subject: [PATCH] --- yaml --- r: 62629 b: refs/heads/master c:
 7dea1b20066cd30fb54da7e686b16b5e38b46b2d h: refs/heads/master i:   62627:
 bfd22981f6ad1c74401b3d4a488c60736ed49864 v: v3

---
 [refs]                                          | 2 +-
 trunk/include/asm-arm/arch-iop13xx/uncompress.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db2da0f191e4..1126c6fe5d8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8135fcfd0431eda3653c7069e7aefc8674fdfbe
+refs/heads/master: 7dea1b20066cd30fb54da7e686b16b5e38b46b2d
diff --git a/trunk/include/asm-arm/arch-iop13xx/uncompress.h b/trunk/include/asm-arm/arch-iop13xx/uncompress.h
index b9525d59b7ad..dd9c2934190e 100644
--- a/trunk/include/asm-arm/arch-iop13xx/uncompress.h
+++ b/trunk/include/asm-arm/arch-iop13xx/uncompress.h
@@ -1,7 +1,6 @@
 #include <asm/types.h>
 #include <linux/serial_reg.h>
 #include <asm/hardware.h>
-#include <asm/processor.h>
 
 #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS)
 #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
@@ -9,7 +8,7 @@
 static inline void putc(char c)
 {
 	while ((UART_BASE[UART_LSR] & TX_DONE) != TX_DONE)
-		cpu_relax();
+		barrier();
 	UART_BASE[UART_TX] = c;
 }