projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.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
[platform/adaptation/renesas_rcar/renesas_kernel.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
589066f
..
712a7fb
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
};