---

yaml --- r: 62629 b: refs/heads/master c: 7dea1b2 h: refs/heads/master i: 62627: bfd2298 v: v3
git-mirror · Jul 20, 2007 · d24c86b · d24c86b
1 parent ccb6961
commit d24c86b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -1,15 +1,14 @@
 #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)
 
 static inline void putc(char c)
 {
 	while ((UART_BASE[UART_LSR] & TX_DONE) != TX_DONE)
-		cpu_relax();
+		barrier();
 	UART_BASE[UART_TX] = c;
 }