diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-03-07 14:22:29 +0100 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-03-07 14:22:29 +0100 |
| commit | 0b8129278fdc30fa3281f435db419ab2d610085b (patch) | |
| tree | e209a295692d2d09ec8771c999d2ba82d4fd4151 /arch/arm/mach-pxa/mxm8x10.c | |
| parent | 53ad4a78f6671f66938d293e21bb6b2ec4b8e828 (diff) | |
| parent | 048a4663a2a4b1b784f1c284d30873901148f009 (diff) | |
| download | linux-0b8129278fdc30fa3281f435db419ab2d610085b.tar.gz linux-0b8129278fdc30fa3281f435db419ab2d610085b.tar.bz2 linux-0b8129278fdc30fa3281f435db419ab2d610085b.zip | |
Merge tag 'nand/pxa3xx-removal' of git://git.infradead.org/linux-mtd into pxa/for-next
Remove the pxa3xx_nand driver (replaced by marvell_nand).
Diffstat (limited to 'arch/arm/mach-pxa/mxm8x10.c')
| -rw-r--r-- | arch/arm/mach-pxa/mxm8x10.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c index f9e3d41a4609..616b22397d73 100644 --- a/arch/arm/mach-pxa/mxm8x10.c +++ b/arch/arm/mach-pxa/mxm8x10.c @@ -359,7 +359,7 @@ void __init mxm_8x10_ac97_init(void) } /* NAND flash Support */ -#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE) +#if IS_ENABLED(CONFIG_MTD_NAND_MARVELL) #define NAND_BLOCK_SIZE SZ_128K #define NB(x) (NAND_BLOCK_SIZE * (x)) static struct mtd_partition mxm_8x10_nand_partitions[] = { @@ -389,11 +389,9 @@ static struct mtd_partition mxm_8x10_nand_partitions[] = { }; static struct pxa3xx_nand_platform_data mxm_8x10_nand_info = { - .enable_arbiter = 1, .keep_config = 1, - .num_cs = 1, - .parts[0] = mxm_8x10_nand_partitions, - .nr_parts[0] = ARRAY_SIZE(mxm_8x10_nand_partitions) + .parts = mxm_8x10_nand_partitions, + .nr_parts = ARRAY_SIZE(mxm_8x10_nand_partitions) }; static void __init mxm_8x10_nand_init(void) @@ -402,7 +400,7 @@ static void __init mxm_8x10_nand_init(void) } #else static inline void mxm_8x10_nand_init(void) {} -#endif /* CONFIG_MTD_NAND_PXA3xx || CONFIG_MTD_NAND_PXA3xx_MODULE */ +#endif /* IS_ENABLED(CONFIG_MTD_NAND_MARVELL) */ /* Ethernet support: Davicom DM9000 */ static struct resource dm9k_resources[] = { |