commit 47bd825edf4d165649daec9b4c6bb1ade6f04719
author Kim Phillips <kim.phillips@freescale.com> Mon Oct 29 13:34:25 2012 +0000
committer Tom Rini <trini@ti.com> Sun Nov 04 11:00:34 2012 -0700
tree f308d425ee4a7b8682f59e062175c259a7bcde00
parent 632fe9ce3f9989b5044bf0152b58e3306fdcbf77

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 <kim.phillips@freescale.com>

include/linux/unaligned/generic.h

diff --git a/include/linux/unaligned/generic.h b/include/linux/unaligned/generic.h
index cc688e1..02d97ff 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