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/configs/pxa_defconfig | |
| 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/configs/pxa_defconfig')
| -rw-r--r-- | arch/arm/configs/pxa_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 837d0c9c8b0e..5655a1cee87d 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -197,7 +197,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x4000000 CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y CONFIG_MTD_NAND_SHARPSL=m -CONFIG_MTD_NAND_PXA3xx=m +CONFIG_MTD_NAND_MARVELL=m CONFIG_MTD_NAND_CM_X270=m CONFIG_MTD_NAND_TMIO=m CONFIG_MTD_NAND_BRCMNAND=m |