diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-02-25 11:40:22 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-02-25 11:40:26 +0300 |
commit | 996de8c6fe95c5a9fc524241cc8f142ef0605d3d (patch) | |
tree | 0f637ab0d80d6d7e213707ac2d8c1cc16b69523c /arch/arm/mach-gemini/include/mach/uncompress.h | |
parent | 017c426138122c8e9b9f5057fbd0567c37b35247 (diff) | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
download | linux-996de8c6fe95c5a9fc524241cc8f142ef0605d3d.tar.xz |
Merge commit 'v2.6.33' into core/rcu
Merge reason: Update from -rc4 to -final.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-gemini/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/mach-gemini/include/mach/uncompress.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/include/mach/uncompress.h b/arch/arm/mach-gemini/include/mach/uncompress.h index 59c5df7e716c..5483f61a8061 100644 --- a/arch/arm/mach-gemini/include/mach/uncompress.h +++ b/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 |