diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-14 20:36:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-18 12:44:51 +0000 |
| commit | b53e9b5ebd5c6e718f54bcacd4e97b71533ca681 (patch) | |
| tree | 055a09686eefa24a4bc72be7c25847c690f34c7d /arch/arm/plat-mxc/include/mach | |
| parent | 95b8f20fd6a2694a16b8addb190b942bfb670c88 (diff) | |
| download | op-kernel-dev-b53e9b5ebd5c6e718f54bcacd4e97b71533ca681.zip op-kernel-dev-b53e9b5ebd5c6e718f54bcacd4e97b71533ca681.tar.gz | |
ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)
Because of the include of the decompress_inflate.c file from
boot/compress/misc.c, there are different flush() defines:
In file included from arch/arm/boot/compressed/misc.c:249:
arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0
Fix this by removing the define of flush() in misc.c for
CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h,
and that is being included unconditionally.
Also use a static inline function instead of define
for mach-mxc and mach-gemini to avoid similar bug
for those platforms.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/uncompress.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h index 4d5d395..d49384c 100644 --- a/arch/arm/plat-mxc/include/mach/uncompress.h +++ b/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 |
