diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-04 10:24:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-04 10:24:35 -0500 |
| commit | 0c4d24823ed28c94dae56a10a66687c69b70c1d1 (patch) | |
| tree | 0ac63ef5788ed22b7864e9397f8379c38b2db4db /include | |
| parent | da63df97ea100053ea34cc022a1660f760ec32b4 (diff) | |
| parent | 0faef2eba946a95f9c78d2b3db47e15bac04b52e (diff) | |
Merge git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/fsl_upm.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/fsmc_nand.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/rawnand.h (renamed from include/linux/mtd/nand.h) | 10 | ||||
| -rw-r--r-- | include/nand.h | 2 |
4 files changed, 7 insertions, 9 deletions
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..6c3e838d80 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> @@ -22,6 +20,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/flashchip.h> #include <linux/mtd/bbm.h> +#include <asm/cache.h> struct mtd_info; struct nand_flash_dev; @@ -1270,5 +1269,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); |