include/linux/compat.h: fix warning: preprocessor token {__iomem, __user} redefined

[people/ms/u-boot.git] / include / linux / mtd / mtd-abi.h

diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h
index 410c5dd2fb4114a339ca6a9fa70a9b5bdbcc6d52..8bdd23112b4f2cfd5c40079e8301c7ba2ba0966e 100644 (file)
--- a/include/linux/mtd/mtd-abi.h
+++ b/include/linux/mtd/mtd-abi.h
@@ -8,9 +8,11 @@
 #define __MTD_ABI_H__
 
 #if 1
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
 #endif
 
+#include <linux/compiler.h>
+
 struct erase_info_user {
        uint32_t start;
        uint32_t length;
@@ -123,7 +125,7 @@ struct nand_oobfree {
  */
 struct nand_ecclayout {
        uint32_t eccbytes;
-       uint32_t eccpos[64];
+       uint32_t eccpos[128];
        uint32_t oobavail;
        struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES];
 };