diff options
35 files changed, 37 insertions, 40 deletions
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h index f343ac2c0f..e26381c7fd 100644 --- a/arch/arm/include/asm/ti-common/davinci_nand.h +++ b/arch/arm/include/asm/ti-common/davinci_nand.h @@ -9,7 +9,7 @@ #ifndef _DAVINCI_NAND_H_ #define _DAVINCI_NAND_H_ -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <asm/arch/hardware.h> #define NAND_READ_START 0x00 diff --git a/arch/arm/mach-omap2/omap3/spl_id_nand.c b/arch/arm/mach-omap2/omap3/spl_id_nand.c index 0e2f0a2f6d..5c9549c743 100644 --- a/arch/arm/mach-omap2/omap3/spl_id_nand.c +++ b/arch/arm/mach-omap2/omap3/spl_id_nand.c @@ -14,7 +14,7 @@ #include <common.h> #include <jffs2/load_kernel.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/omap_gpmc.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index 98430c4246..78ddbbbad1 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -16,7 +16,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/clk.h> #include <lcd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <atmel_lcdc.h> #include <asm/mach-types.h> diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c index e59516f612..d35afa5cad 100644 --- a/board/isee/igep00x0/common.c +++ b/board/isee/igep00x0/common.c @@ -8,7 +8,7 @@ #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <jffs2/load_kernel.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include "igep00x0.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index 5c7f256711..01bb99fbb8 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -18,7 +18,7 @@ #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/onenand.h> #include <jffs2/load_kernel.h> #include <mtd_node.h> diff --git a/board/isee/igep00x0/spl.c b/board/isee/igep00x0/spl.c index eb705cbe88..f1c99dd7cf 100644 --- a/board/isee/igep00x0/spl.c +++ b/board/isee/igep00x0/spl.c @@ -5,7 +5,7 @@ #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h> #include <jffs2/load_kernel.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include "igep00x0.h" /* diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 1da9e383c2..a55a520e63 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -26,7 +26,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-types.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <asm/omap_musb.h> #include <linux/errno.h> #include <linux/usb/ch9.h> diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c index f3263eba6e..dd2db9a762 100644 --- a/board/mini-box/picosam9g45/picosam9g45.c +++ b/board/mini-box/picosam9g45/picosam9g45.c @@ -20,7 +20,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/clk.h> #include <lcd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <atmel_lcdc.h> #include <atmel_mci.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) diff --git a/board/overo/overo.c b/board/overo/overo.c index 140e34d4dd..7b44a37103 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -17,7 +17,7 @@ #include <ns16550.h> #include <netdev.h> #include <twl4030.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <asm/io.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 8390bdd5f8..71541ba3a4 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -26,7 +26,7 @@ #include <asm/arch/atmel_serial.h> #include <asm/arch/clk.h> #include <asm/gpio.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <atmel_mci.h> #include <asm/arch/at91_spi.h> #include <spi.h> diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 2f62fbec69..bdf84b0be8 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -20,7 +20,7 @@ #include <status_led.h> #endif #include <twl4030.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <asm/io.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 1f0433dcc0..4d5ddff1e1 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -25,7 +25,7 @@ #include <twl4030.h> #include <asm/mach-types.h> #include <asm/omap_musb.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/musb.h> diff --git a/cmd/jffs2.c b/cmd/jffs2.c index aee2f4513d..13c533cf12 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -80,7 +80,7 @@ #include <cramfs/cramfs_fs.h> #if defined(CONFIG_CMD_NAND) -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <nand.h> #endif diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index 3275eb919b..3169c33265 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -81,7 +81,7 @@ #include <linux/mtd/mtd.h> #if defined(CONFIG_CMD_NAND) -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <nand.h> #endif diff --git a/drivers/mtd/nand/arasan_nfc.c b/drivers/mtd/nand/arasan_nfc.c index a8f795d957..14b27337b6 100644 --- a/drivers/mtd/nand/arasan_nfc.c +++ b/drivers/mtd/nand/arasan_nfc.c @@ -11,7 +11,7 @@ #include <asm/io.h> #include <linux/errno.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> #include <linux/mtd/nand_ecc.h> #include <asm/arch/hardware.h> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index 04b4ae2683..bdaea71f91 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -9,7 +9,7 @@ #define __DENALI_H__ #include <linux/bitops.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/types.h> #define DEVICE_RESET 0x0 diff --git a/drivers/mtd/nand/denali_spl.c b/drivers/mtd/nand/denali_spl.c index 3cb9849735..1a59b937a6 100644 --- a/drivers/mtd/nand/denali_spl.c +++ b/drivers/mtd/nand/denali_spl.c @@ -8,7 +8,7 @@ #include <common.h> #include <asm/io.h> #include <asm/unaligned.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include "denali.h" #define DENALI_MAP01 (1 << 26) /* read/write pages in PIO */ diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c index b3c23b0339..fc3720b3bd 100644 --- a/drivers/mtd/nand/fsl_elbc_nand.c +++ b/drivers/mtd/nand/fsl_elbc_nand.c @@ -13,7 +13,7 @@ #include <nand.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/nand_ecc.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index a757a3be44..d1165f7d6b 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -12,7 +12,7 @@ #include <nand.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/nand_ecc.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index 4e49a4e154..59461945d3 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -10,7 +10,7 @@ #include <common.h> #include <asm/io.h> #include <fsl_ifc.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #ifdef CONFIG_CHAIN_OF_TRUST #include <fsl_validate.h> #endif diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index d774ab8d82..bed9b65ef4 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -15,7 +15,7 @@ #include <common.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/types.h> #include <malloc.h> #include <linux/errno.h> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index aca32318d5..eb9f121f81 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -37,7 +37,7 @@ #include <linux/err.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_bch.h> #ifdef CONFIG_MTD_PARTITIONS diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 74c4c9a3c8..ba785c5d53 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -62,7 +62,7 @@ #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/bbm.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/bitops.h> #include <linux/string.h> diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c index 6c20d53e7e..b7c1171d50 100644 --- a/drivers/mtd/nand/nand_bch.c +++ b/drivers/mtd/nand/nand_bch.c @@ -13,7 +13,7 @@ #include <linux/bitops.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/nand_bch.h> #include <linux/bch.h> #include <malloc.h> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index d36f9006c9..4009d64123 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c @@ -7,7 +7,7 @@ * */ #include <common.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/sizes.h> #define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c index 9935557291..c0545a4fb1 100644 --- a/drivers/mtd/nand/nand_timings.c +++ b/drivers/mtd/nand/nand_timings.c @@ -10,7 +10,7 @@ */ #include <common.h> #include <linux/kernel.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> static const struct nand_data_interface onfi_sdr_timings[] = { /* Mode 0 */ diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index cedbb239b6..a3ca3373e4 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -15,7 +15,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/types.h> #include "pxa3xx_nand.h" diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 8bc3828854..532e03cd84 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -32,7 +32,7 @@ #include <linux/kernel.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> #include <linux/io.h> diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c index f99bdaf94d..dd53f2bedb 100644 --- a/drivers/mtd/nand/vf610_nfc.c +++ b/drivers/mtd/nand/vf610_nfc.c @@ -26,7 +26,7 @@ #include <malloc.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> #include <nand.h> diff --git a/drivers/mtd/nand/zynq_nand.c b/drivers/mtd/nand/zynq_nand.c index 076b878244..6494196049 100644 --- a/drivers/mtd/nand/zynq_nand.c +++ b/drivers/mtd/nand/zynq_nand.c @@ -13,7 +13,7 @@ #include <linux/errno.h> #include <nand.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> #include <linux/mtd/nand_ecc.h> #include <asm/arch/hardware.h> diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c index 636c7770e2..d338f9aa91 100644 --- a/fs/yaffs2/yaffs_mtdif.c +++ b/fs/yaffs2/yaffs_mtdif.c @@ -22,7 +22,7 @@ #include <linux/mtd/mtd.h> #include <linux/types.h> #include <linux/time.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> static inline void translate_spare2oob(const struct yaffs_spare *spare, u8 *oob) diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h index 0a949bca0d..a023860e7b 100644 --- a/include/linux/mtd/fsl_upm.h +++ b/include/linux/mtd/fsl_upm.h @@ -10,7 +10,7 @@ #ifndef __LINUX_MTD_NAND_FSL_UPM #define __LINUX_MTD_NAND_FSL_UPM -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #define FSL_UPM_WAIT_RUN_PATTERN 0x1 #define FSL_UPM_WAIT_WRITE_BYTE 0x2 diff --git a/include/linux/mtd/fsmc_nand.h b/include/linux/mtd/fsmc_nand.h index f0f77270af..bc3db030d0 100644 --- a/include/linux/mtd/fsmc_nand.h +++ b/include/linux/mtd/fsmc_nand.h @@ -8,7 +8,7 @@ #ifndef __FSMC_NAND_H__ #define __FSMC_NAND_H__ -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> struct fsmc_regs { u32 ctrl; /* 0x00 */ diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h index d1db34c334..192709b6e4 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/rawnand.h @@ -1,6 +1,4 @@ /* - * linux/include/linux/mtd/nand.h - * * Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org> * Steven J. Hill <sjhill@realitydiluted.com> * Thomas Gleixner <tglx@linutronix.de> @@ -13,8 +11,8 @@ * Changelog: * See git changelog. */ -#ifndef __LINUX_MTD_NAND_H -#define __LINUX_MTD_NAND_H +#ifndef __LINUX_MTD_RAWNAND_H +#define __LINUX_MTD_RAWNAND_H #include <config.h> @@ -1270,5 +1268,4 @@ int nand_maximize_ecc(struct nand_chip *chip, /* Reset and initialize a NAND device */ int nand_reset(struct nand_chip *chip, int chipnr); - -#endif /* __LINUX_MTD_NAND_H */ +#endif /* __LINUX_MTD_RAWNAND_H */ diff --git a/include/nand.h b/include/nand.h index c1c1d8cce6..cead563553 100644 --- a/include/nand.h +++ b/include/nand.h @@ -32,7 +32,7 @@ unsigned long nand_size(void); #include <linux/compat.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> int nand_mtd_to_devnum(struct mtd_info *mtd); |