diff options
Diffstat (limited to 'drivers/mtd/nand/cafe_nand.c')
-rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index e5a9f9ccea60..db1dfc5a1b11 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
@@ -762,7 +762,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev, | |||
762 | cafe_readl(cafe, GLOBAL_CTRL), cafe_readl(cafe, GLOBAL_IRQ_MASK)); | 762 | cafe_readl(cafe, GLOBAL_CTRL), cafe_readl(cafe, GLOBAL_IRQ_MASK)); |
763 | 763 | ||
764 | /* Scan to find existence of the device */ | 764 | /* Scan to find existence of the device */ |
765 | if (nand_scan_ident(mtd, 2)) { | 765 | if (nand_scan_ident(mtd, 2, NULL)) { |
766 | err = -ENXIO; | 766 | err = -ENXIO; |
767 | goto out_irq; | 767 | goto out_irq; |
768 | } | 768 | } |
@@ -849,7 +849,7 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev) | |||
849 | kfree(mtd); | 849 | kfree(mtd); |
850 | } | 850 | } |
851 | 851 | ||
852 | static struct pci_device_id cafe_nand_tbl[] = { | 852 | static const struct pci_device_id cafe_nand_tbl[] = { |
853 | { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND, | 853 | { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND, |
854 | PCI_ANY_ID, PCI_ANY_ID }, | 854 | PCI_ANY_ID, PCI_ANY_ID }, |
855 | { } | 855 | { } |