diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2012-10-29 13:34:24 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-04 11:00:34 -0700 |
| commit | 0d4c1c91bb2852ff6f4e46f40e72e74ec10599c5 (patch) | |
| tree | f64baecaa11368aa8f0553ee25dc6ee0baae315b /include | |
| parent | eef1cf2d5cf1cae5fb76713e912263dedf110aeb (diff) | |
| download | u-boot-imx-0d4c1c91bb2852ff6f4e46f40e72e74ec10599c5.zip u-boot-imx-0d4c1c91bb2852ff6f4e46f40e72e74ec10599c5.tar.gz u-boot-imx-0d4c1c91bb2852ff6f4e46f40e72e74ec10599c5.tar.bz2 | |
include/linux/compat.h: fix warning: preprocessor token {__iomem, __user} redefined
include/linux/compat.h:4:9: warning: preprocessor token __user redefined
include/linux/compiler.h:7:10: this was the original definition
include/linux/compat.h:5:9: warning: preprocessor token __iomem redefined
include/linux/compiler.h:12:10: this was the original definition
fixup __iomem, __user 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
932394ac43e2e778e664eeb6e456fecd0fae6e59 "Rewrite of NAND code based on
what is in 2.6.12 Linux kernel".
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 3 | ||||
| -rw-r--r-- | include/linux/mtd/mtd-abi.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 593b07f..e1338bf 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -1,9 +1,6 @@ #ifndef _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_ -#define __user -#define __iomem - #define ndelay(x) udelay(1) #define printk printf diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h index 5991157..8bdd231 100644 --- a/include/linux/mtd/mtd-abi.h +++ b/include/linux/mtd/mtd-abi.h @@ -11,6 +11,8 @@ #include <linux/compat.h> #endif +#include <linux/compiler.h> + struct erase_info_user { uint32_t start; uint32_t length; |