diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 17:00:12 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 17:00:12 +0200 |
| commit | a75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch) | |
| tree | 86be6c413298b08e159d9f9019d52abd06540809 /drivers/mtd/nand/atmel | |
| parent | mtd: nand: tmio: Register partitions using the parsers (diff) | |
| parent | mtd: nand: Rename nand.h into rawnand.h (diff) | |
| download | linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.xz linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.zip | |
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'drivers/mtd/nand/atmel')
| -rw-r--r-- | drivers/mtd/nand/atmel/nand-controller.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/atmel/pmecc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c index 6b9d0ba3d707..46a161b6962e 100644 --- a/drivers/mtd/nand/atmel/nand-controller.c +++ b/drivers/mtd/nand/atmel/nand-controller.c @@ -59,7 +59,7 @@ #include <linux/mfd/syscon/atmel-matrix.h> #include <linux/mfd/syscon/atmel-smc.h> #include <linux/module.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c index 55a8ee5306ea..27a969a8f105 100644 --- a/drivers/mtd/nand/atmel/pmecc.c +++ b/drivers/mtd/nand/atmel/pmecc.c @@ -47,7 +47,7 @@ #include <linux/genalloc.h> #include <linux/iopoll.h> #include <linux/module.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> |