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-omap1
/
board-fsample.c
diff --git
a/arch/arm/mach-omap1/board-fsample.c
b/arch/arm/mach-omap1/board-fsample.c
index fad95b74bb65db16ed09aa21f4f0634cf445b937..b93ad58b0a63fc3f5694d2e7fe76e0240f66e8ca 100644
(file)
--- a/
arch/arm/mach-omap1/board-fsample.c
+++ b/
arch/arm/mach-omap1/board-fsample.c
@@
-16,7
+16,7
@@
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/input.h>