From: Tony Lindgren Date: Thu, 14 Jan 2010 19:36:55 +0000 (+0100) Subject: ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void) X-Git-Tag: v2.6.33-rc5~14^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b53e9b5ebd5c6e718f54bcacd4e97b71533ca681;p=pandora-kernel.git 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 Signed-off-by: Russell King --- Reading git-diff-tree failed