---

yaml --- r: 179609 b: refs/heads/master c: b53e9b5 h: refs/heads/master i: 179607: 9c9f768 v: v3
git-mirror · Jan 18, 2010 · 7bfbcb6 · 7bfbcb6
1 parent c82ccff
commit 7bfbcb6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95b8f20fd6a2694a16b8addb190b942bfb670c88
+refs/heads/master: b53e9b5ebd5c6e718f54bcacd4e97b71533ca681
diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -88,7 +88,6 @@ static void icedcc_putc(int ch)
 #endif
 
 #define putc(ch)	icedcc_putc(ch)
-#define flush()	do { } while (0)
 #endif
 
 static void putstr(const char *ptr)

diff --git a/trunk/arch/arm/mach-gemini/include/mach/uncompress.h b/trunk/arch/arm/mach-gemini/include/mach/uncompress.h
@@ -30,7 +30,9 @@ static inline void putc(char c)
 	UART[UART_TX] = c;
 }
 
-#define flush() do { } while (0)
+static inline void flush(void)
+{
+}
 
 /*
  * nothing to do

diff --git a/trunk/arch/arm/plat-mxc/include/mach/uncompress.h b/trunk/arch/arm/plat-mxc/include/mach/uncompress.h
@@ -60,7 +60,9 @@ static void putc(int ch)
 	UART(TXR) = ch;
 }
 
-#define flush() do { } while (0)
+static inline void flush(void)
+{
+}
 
 #define MX1_UART1_BASE_ADDR	0x00206000
 #define MX25_UART1_BASE_ADDR	0x43f90000
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,6 @@ static void icedcc_putc(int ch) @@
     #endif
     #define putc(ch)	icedcc_putc(ch)
-    #define flush()	do { } while (0)
     #endif
     static void putstr(const char *ptr)
@@ Expand Down @@