projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux...
[linux-2.6-block.git]
/
drivers
/
mtd
/
nand
/
mxc_nand.c
diff --git
a/drivers/mtd/nand/mxc_nand.c
b/drivers/mtd/nand/mxc_nand.c
index 8ec7cc007deebe2035fb3585d52e1043d79d3832..72e31d86030d9c2e2b7f9cb20302b4b7955877f0 100644
(file)
--- a/
drivers/mtd/nand/mxc_nand.c
+++ b/
drivers/mtd/nand/mxc_nand.c
@@
-36,7
+36,7
@@
#include <linux/of_mtd.h>
#include <asm/mach/flash.h>
-#include <
mach/
mxc_nand.h>
+#include <
linux/platform_data/mtd-
mxc_nand.h>
#include <mach/hardware.h>
#define DRIVER_NAME "mxc_nand"