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 'fdpic' of http://git.linaro.org/people/nicolas.pitre/linux into devel...
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
inftlcore.c
diff --git
a/drivers/mtd/inftlcore.c
b/drivers/mtd/inftlcore.c
index 8db740d6eb08117404d2c8e5f02779fcf3bf8829..57ef1fb42a049b802ec5aac895b9e02e11c21628 100644
(file)
--- a/
drivers/mtd/inftlcore.c
+++ b/
drivers/mtd/inftlcore.c
@@
-33,7
+33,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/nftl.h>
#include <linux/mtd/inftl.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/uaccess.h>
#include <asm/errno.h>
#include <asm/io.h>