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/raumfeld.c | |
| parent | 53ad4a78f6671f66938d293e21bb6b2ec4b8e828 (diff) | |
| parent | 048a4663a2a4b1b784f1c284d30873901148f009 (diff) | |
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/raumfeld.c')
| -rw-r--r-- | arch/arm/mach-pxa/raumfeld.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index d3927bd4e1b8..fd0283a3d093 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c @@ -346,11 +346,9 @@ static struct mtd_partition raumfeld_nand_partitions[] = { }; static struct pxa3xx_nand_platform_data raumfeld_nand_info = { - .enable_arbiter = 1, .keep_config = 1, - .num_cs = 1, - .parts[0] = raumfeld_nand_partitions, - .nr_parts[0] = ARRAY_SIZE(raumfeld_nand_partitions), + .parts = raumfeld_nand_partitions, + .nr_parts = ARRAY_SIZE(raumfeld_nand_partitions), }; /** |