projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
mach-mx31_3ds.c
diff --git
a/arch/arm/mach-imx/mach-mx31_3ds.c
b/arch/arm/mach-imx/mach-mx31_3ds.c
index 589066fb3316ae794dc84ff98e67e37c1a716232..712a7fb1cf015205477ec4f0bbf62bbd970a0b1d 100644
(file)
--- a/
arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/
arch/arm/mach-imx/mach-mx31_3ds.c
@@
-542,7
+542,7
@@
static const struct mxc_nand_platform_data
mx31_3ds_nand_board_info __initconst = {
.width = 1,
.hw_ecc = 1,
-#ifdef MACH_MX31_3DS_MXC_NAND_USE_BBT
+#ifdef
CONFIG_
MACH_MX31_3DS_MXC_NAND_USE_BBT
.flash_bbt = 1,
#endif
};