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 tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c24xx
/
mach-osiris.c
diff --git
a/arch/arm/mach-s3c24xx/mach-osiris.c
b/arch/arm/mach-s3c24xx/mach-osiris.c
index 64b1a0b7b803a19347d522e4ffbda3f970242ad7..ed3b22ceef06c75cbca69a8f2e5cef72183a3a47 100644
(file)
--- a/
arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/
arch/arm/mach-s3c24xx/mach-osiris.c
@@
-36,7
+36,7
@@
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h>