git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
nand
/
mpc5121_nfc.c
diff --git
a/drivers/mtd/nand/mpc5121_nfc.c
b/drivers/mtd/nand/mpc5121_nfc.c
index 0e86fb6277c3ae7c5f111bafead23c18f676ffa3..b6b97cc9fba6966ec2efaa2dd40e6859ca4e2a51 100644
(file)
--- a/
drivers/mtd/nand/mpc5121_nfc.c
+++ b/
drivers/mtd/nand/mpc5121_nfc.c
@@
-33,7
+33,7
@@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/mtd/partitions.h>
#include <linux/of_address.h>
#include <linux/of_device.h>