diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-02-19 23:35:52 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-02-23 21:55:04 +0100 |
| commit | 349dfe6c85266eb2ddec7587553934169aa5755f (patch) | |
| tree | 5e76a393f67ec8465136384e45aa509034d0d6ec /arch/arm/mach-pxa/colibri.h | |
| parent | Linux 4.16-rc1 (diff) | |
| download | linux-349dfe6c85266eb2ddec7587553934169aa5755f.tar.xz linux-349dfe6c85266eb2ddec7587553934169aa5755f.zip | |
mtd: nand: use Marvell reworked NAND controller driver with all platforms
Compile marvell_nand.c instead of pxa3xx_nand.c with all PXA based SoCs.
Convert all board files and defconfigs so that the new driver is used
everywhere instead of the old one.
Board files using CONFIG_MTD_NAND_PXA3xx now use CONFIG_MTD_NAND_MARVELL
instead.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Diffstat (limited to 'arch/arm/mach-pxa/colibri.h')
| -rw-r--r-- | arch/arm/mach-pxa/colibri.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri.h b/arch/arm/mach-pxa/colibri.h index 673a131da875..85525d49e321 100644 --- a/arch/arm/mach-pxa/colibri.h +++ b/arch/arm/mach-pxa/colibri.h @@ -46,7 +46,7 @@ static inline void colibri_pxa3xx_init_lcd(int bl_pin) {} extern void colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data); #endif -#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE) +#if IS_ENABLED(CONFIG_MTD_NAND_MARVELL) extern void colibri_pxa3xx_init_nand(void); #else static inline void colibri_pxa3xx_init_nand(void) {} |