From: Kim Phillips Date: Mon, 29 Oct 2012 13:34:25 +0000 (+0000) Subject: include/linux/unaligned/generic.h: fix warning: preprocessor token __force redefined X-Git-Tag: v2013.01-rc1~25 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=25b26ec69fb5390ce08601189d8848fcef91b97c;p=oweals%2Fu-boot.git include/linux/unaligned/generic.h: fix warning: preprocessor token __force redefined include/linux/unaligned/generic.h:5:9: warning: preprocessor token __force redefined include/linux/compiler.h:10:10: this was the original definition fixup __force definitions in compat.h code appears to be placed there as a cover up from a code import from linux when u-boot didn't yet have a compiler.h, introduced by commit b1b4e89a0f3b75854c39a62cae41bad56d210adf "Add LZO decompressor support". Signed-off-by: Kim Phillips --- diff --git a/include/linux/unaligned/generic.h b/include/linux/unaligned/generic.h index cc688e1eb1..02d97ff3df 100644 --- a/include/linux/unaligned/generic.h +++ b/include/linux/unaligned/generic.h @@ -1,9 +1,6 @@ #ifndef _LINUX_UNALIGNED_GENERIC_H #define _LINUX_UNALIGNED_GENERIC_H -/* define __force to nothing in U-Boot */ -#define __force - /* * Cause a link-time error if we try an unaligned access other than * 1,2,4 or 8 bytes long