diff options
-rw-r--r-- | board/samsung/smdkc100/onenand.c | 2 | ||||
-rw-r--r-- | common/cmd_onenand.c | 2 | ||||
-rw-r--r-- | common/env_onenand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdconcat.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdcore.c | 2 | ||||
-rw-r--r-- | drivers/mtd/mtdpart.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/onenand_uboot.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/samsung.c | 2 | ||||
-rw-r--r-- | fs/jffs2/jffs2_1pass.c | 2 | ||||
-rw-r--r-- | include/linux/compat.h (renamed from include/linux/mtd/compat.h) | 0 | ||||
-rw-r--r-- | include/linux/err.h | 2 | ||||
-rw-r--r-- | include/linux/mtd/mtd-abi.h | 2 | ||||
-rw-r--r-- | include/linux/mtd/nand.h | 2 | ||||
-rw-r--r-- | include/linux/mtd/onenand.h | 2 | ||||
-rw-r--r-- | include/nand.h | 2 |
20 files changed, 19 insertions, 19 deletions
diff --git a/board/samsung/smdkc100/onenand.c b/board/samsung/smdkc100/onenand.c index 501855edd3..e34cd31f24 100644 --- a/board/samsung/smdkc100/onenand.c +++ b/board/samsung/smdkc100/onenand.c @@ -22,7 +22,7 @@ */ #include <common.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> #include <linux/mtd/samsung_onenand.h> diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index 0f2e208717..a0d25e5521 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -13,7 +13,7 @@ #include <command.h> #include <malloc.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/common/env_onenand.c b/common/env_onenand.c index 652665a189..7197ab6585 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -33,7 +33,7 @@ #include <errno.h> #include <onenand_uboot.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index fc2270127a..e6d938417d 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -9,7 +9,7 @@ */ #include <linux/mtd/mtd.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/concat.h> #include <ubi_uboot.h> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index a195ddab35..3a81adaf60 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -8,7 +8,7 @@ */ #include <linux/mtd/mtd.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <ubi_uboot.h> struct mtd_info *mtd_table[MAX_MTD_DEVICES]; diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index f647e43668..96dcda2b2b 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -17,7 +17,7 @@ #include <linux/list.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> /* Our partition linked list */ struct list_head mtd_partitions; diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index 7fd8a35479..e6b7a70661 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -29,7 +29,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <asm/errno.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 44f7b91457..bef79bed0f 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -39,7 +39,7 @@ #include <malloc.h> #include <watchdog.h> #include <linux/err.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 2b730e09c9..dc6c6480e5 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -61,7 +61,7 @@ #include <common.h> #include <malloc.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 1d0f196c12..1a7b40eaa3 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -20,7 +20,7 @@ */ #include <common.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 1354877729..9d5da54708 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -15,7 +15,7 @@ */ #include <common.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> #include <malloc.h> diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index c642016c2d..ae60c3bb71 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -14,7 +14,7 @@ */ #include <common.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index c9d33ec825..0d94ea5b1f 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -28,7 +28,7 @@ #include <common.h> #include <malloc.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> #include <linux/mtd/samsung_onenand.h> diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index a0b02e4dda..c856983ef4 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -119,7 +119,7 @@ #include <watchdog.h> #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <asm/errno.h> #include "jffs2_private.h" diff --git a/include/linux/mtd/compat.h b/include/linux/compat.h index 39c693f7a8..39c693f7a8 100644 --- a/include/linux/mtd/compat.h +++ b/include/linux/compat.h diff --git a/include/linux/err.h b/include/linux/err.h index 4e08c4fe68..96c0c72baa 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -5,7 +5,7 @@ #if 0 #include <linux/compiler.h> #else -#include <linux/mtd/compat.h> +#include <linux/compat.h> #endif #include <asm/errno.h> diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h index 8d5f60c75e..5991157065 100644 --- a/include/linux/mtd/mtd-abi.h +++ b/include/linux/mtd/mtd-abi.h @@ -8,7 +8,7 @@ #define __MTD_ABI_H__ #if 1 -#include <linux/mtd/compat.h> +#include <linux/compat.h> #endif struct erase_info_user { diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index da6fa184c3..82704de083 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -20,7 +20,7 @@ #include "config.h" -#include "linux/mtd/compat.h" +#include "linux/compat.h" #include "linux/mtd/mtd.h" #include "linux/mtd/bbm.h" diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index bb4a4a6b28..e7b63ddd10 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -17,7 +17,7 @@ /* Note: The header order is impoertant */ #include <onenand_uboot.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/bbm.h> #define MAX_DIES 2 diff --git a/include/nand.h b/include/nand.h index 8b3a1a77a3..a48b1b8ed1 100644 --- a/include/nand.h +++ b/include/nand.h @@ -37,7 +37,7 @@ extern void nand_init(void); -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> |