Staging: merge staging patches into Linus's main branch

[mv-sheeva.git] / drivers / staging / phison / phison.c

diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
index ff30cb0321b92b9cd83eeeb883f5a2b7d43eace4..0c495eacb75b27651298a27f76424231222179b5 100644 (file)
--- a/drivers/staging/phison/phison.c
+++ b/drivers/staging/phison/phison.c
@@ -62,7 +62,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        };
        const struct ata_port_info *ppi[] = { &info, NULL };
 
-       ret = ata_pci_sff_init_one(pdev, ppi, &phison_sht, NULL);
+       ret = ata_pci_sff_init_one(pdev, ppi, &phison_sht, NULL, 0);
 
        dev_dbg(&pdev->dev, "phison_init_one(), ret = %x\n", ret);