projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd
[cascardo/linux.git]
/
drivers
/
mtd
/
nand
/
fsl_ifc_nand.c
diff --git
a/drivers/mtd/nand/fsl_ifc_nand.c
b/drivers/mtd/nand/fsl_ifc_nand.c
index
f8c77e3
..
cb45d2f
100644
(file)
--- a/
drivers/mtd/nand/fsl_ifc_nand.c
+++ b/
drivers/mtd/nand/fsl_ifc_nand.c
@@
-29,7
+29,7
@@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand_ecc.h>
-#include <
asm
/fsl_ifc.h>
+#include <
linux
/fsl_ifc.h>
#define FSL_IFC_V1_1_0 0x01010000
#define ERR_BYTE 0xFF /* Value returned for read