From 0d4c1c91bb2852ff6f4e46f40e72e74ec10599c5 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Mon, 29 Oct 2012 13:34:24 +0000 Subject: [PATCH] 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 --- include/linux/compat.h | 3 --- 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 593b07f4b5..e1338bf489 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 5991157065..8bdd23112b 100644 --- a/include/linux/mtd/mtd-abi.h +++ b/include/linux/mtd/mtd-abi.h @@ -11,6 +11,8 @@ #include #endif +#include + struct erase_info_user { uint32_t start; uint32_t length; -- 2.39.5