diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:15:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:15:10 -0800 |
| commit | def20529227a5c0938c374d11781bd0dbd5edee4 (patch) | |
| tree | 76ba59d7dfdb858892996a59e95a892b43e0e6d2 /arch/arm/mach-gemini/include/mach/uncompress.h | |
| parent | 24bc7347da73a9ed3383056c3d0f28c0e361621e (diff) | |
| parent | 2045124ffd1a5e46d157349016a2c50f19c8c91d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 5888/1: arm: Update comments in cacheflush.h and remove unnecessary V6 and V7 comments
ARM: 5886/1: arm: Fix cpu_proc_fin() for proc-v7.S and make kexec work
ARM: 5885/1: arm: Flush TLB entries in setup_mm_for_reboot()
ARM: 5884/1: arm: Fix DCC console for v7
ARM: 5883/1: Revert "disable NX support for OABI-supporting kernels"
ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)
ARM: fix badly placed mach/plat entries in Kconfig & Makefile
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 |