diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-imx/mach-mx31_3ds.c | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 589066fb3316..712a7fb1cf01 100644 --- 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 | |||
| 542 | mx31_3ds_nand_board_info __initconst = { | 542 | mx31_3ds_nand_board_info __initconst = { |
| 543 | .width = 1, | 543 | .width = 1, |
| 544 | .hw_ecc = 1, | 544 | .hw_ecc = 1, |
| 545 | #ifdef MACH_MX31_3DS_MXC_NAND_USE_BBT | 545 | #ifdef CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT |
| 546 | .flash_bbt = 1, | 546 | .flash_bbt = 1, |
| 547 | #endif | 547 | #endif |
| 548 | }; | 548 | }; |