aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/nand_base.c
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2017-08-23 17:00:12 +0200
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-08-23 17:00:12 +0200
commita75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch)
tree86be6c413298b08e159d9f9019d52abd06540809 /drivers/mtd/nand/nand_base.c
parentmtd: nand: tmio: Register partitions using the parsers (diff)
parentmtd: nand: Rename nand.h into rawnand.h (diff)
downloadlinux-dev-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.xz
linux-dev-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.zip
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
-rw-r--r--drivers/mtd/nand/nand_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ab2804379b0d..8f4a681fd10e 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
#include <linux/nmi.h>
#include <linux/types.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>
#include <linux/interrupt.h>