From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Wed, 23 Aug 2017 15:00:12 +0000 (+0200)
Subject: Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand... 
X-Git-Tag: v4.14-rc1~73^2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a75d6a4cebcc58c4fb139385fc996a62b6f18f68;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
---

a75d6a4cebcc58c4fb139385fc996a62b6f18f68
diff --cc drivers/mtd/nand/vf610_nfc.c
index b88a0c91b4557,8ba9b6de5fa61..8037d4b48a056
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@@ -31,9 -31,10 +31,9 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/of_device.h>
 -#include <linux/pinctrl/consumer.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>