summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/sh_flctl.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/sh_flctl.c
parentmtd: nand: tmio: Register partitions using the parsers (diff)
parentmtd: nand: Rename nand.h into rawnand.h (diff)
downloadlinux-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/sh_flctl.c')
-rw-r--r--drivers/mtd/nand/sh_flctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index d2afd57bc1f2..e7f3c98487e6 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -38,7 +38,7 @@
#include <linux/string.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/sh_flctl.h>