]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
include/linux/unaligned/generic.h: fix warning: preprocessor token __force redefined
authorKim Phillips <kim.phillips@freescale.com>
Mon, 29 Oct 2012 13:34:25 +0000 (13:34 +0000)
committerTom Rini <trini@ti.com>
Sun, 4 Nov 2012 18:00:34 +0000 (11:00 -0700)
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

index cc688e1eb1c4e9186c61d9f9dfa022a2a0bd2e49..02d97ff3df70ed6836b1c5aa03de4a00d4fa41ae 100644 (file)
@@ -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