diff options
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 4cabdc9fda90..4b3aaa898a8b 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -962,7 +962,7 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) | |||
962 | static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info) | 962 | static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info) |
963 | { | 963 | { |
964 | struct platform_device *pdev = info->pdev; | 964 | struct platform_device *pdev = info->pdev; |
965 | if (use_dma) { | 965 | if (info->use_dma) { |
966 | pxa_free_dma(info->data_dma_ch); | 966 | pxa_free_dma(info->data_dma_ch); |
967 | dma_free_coherent(&pdev->dev, info->buf_size, | 967 | dma_free_coherent(&pdev->dev, info->buf_size, |
968 | info->data_buff, info->data_buff_phys); | 968 | info->data_buff, info->data_buff_phys); |
@@ -1259,10 +1259,6 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = { | |||
1259 | .compatible = "marvell,pxa3xx-nand", | 1259 | .compatible = "marvell,pxa3xx-nand", |
1260 | .data = (void *)PXA3XX_NAND_VARIANT_PXA, | 1260 | .data = (void *)PXA3XX_NAND_VARIANT_PXA, |
1261 | }, | 1261 | }, |
1262 | { | ||
1263 | .compatible = "marvell,armada370-nand", | ||
1264 | .data = (void *)PXA3XX_NAND_VARIANT_ARMADA370, | ||
1265 | }, | ||
1266 | {} | 1262 | {} |
1267 | }; | 1263 | }; |
1268 | MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids); | 1264 | MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids); |