diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 18:00:12 +0300 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 18:00:12 +0300 |
| commit | a75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch) | |
| tree | 86be6c413298b08e159d9f9019d52abd06540809 /include/linux/platform_data | |
| parent | 311bba10cb0e232f2f9b0bace8bec873d7dc32a7 (diff) | |
| parent | d4092d76a4a4e57b65910899948a83cc8646c5a5 (diff) | |
| download | linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.xz | |
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mtd-davinci.h | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-s3c2410.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h index 1cf555aef896..f1a2cf655bdb 100644 --- a/include/linux/platform_data/mtd-davinci.h +++ b/include/linux/platform_data/mtd-davinci.h @@ -28,7 +28,7 @@ #ifndef __ARCH_ARM_DAVINCI_NAND_H #define __ARCH_ARM_DAVINCI_NAND_H -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #define NANDFCR_OFFSET 0x60 #define NANDFSR_OFFSET 0x64 diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h index f01659026b26..f8c553f92655 100644 --- a/include/linux/platform_data/mtd-nand-s3c2410.h +++ b/include/linux/platform_data/mtd-nand-s3c2410.h @@ -12,7 +12,7 @@ #ifndef __MTD_NAND_S3C2410_H #define __MTD_NAND_S3C2410_H -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> /** * struct s3c2410_nand_set - define a set of one or more nand chips |