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]
/
arch
/
arm
/
mach-mmp
/
aspenite.c
diff --git
a/arch/arm/mach-mmp/aspenite.c
b/arch/arm/mach-mmp/aspenite.c
index 5db0edf716dd1265accce7aa3017adbac538ab1d..d2283009a5ff1a0b09a9b200ecb2ed1d490ed1be 100644
(file)
--- a/
arch/arm/mach-mmp/aspenite.c
+++ b/
arch/arm/mach-mmp/aspenite.c
@@
-16,7
+16,7
@@
#include <linux/smc91x.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/interrupt.h>
#include <linux/platform_data/mv_usb.h>