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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
board-sffsdr.c
diff --git
a/arch/arm/mach-davinci/board-sffsdr.c
b/arch/arm/mach-davinci/board-sffsdr.c
index 41c7c961579133d9a80070a2c46ce56c07f1d8d9..d85accf7f7608a367eb6361cb8da06803c8d7da8 100644
(file)
--- a/
arch/arm/mach-davinci/board-sffsdr.c
+++ b/
arch/arm/mach-davinci/board-sffsdr.c
@@
-28,7
+28,7
@@
#include <linux/i2c.h>
#include <linux/platform_data/at24.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <linux/mtd/partitions.h>
#include <asm/mach-types.h>