---

yaml --- r: 192610 b: refs/heads/master c: 95cc2c7 h: refs/heads/master v: v3
git-mirror · May 15, 2010 · 0a82103 · 0a82103
1 parent a9d2cac
commit 0a82103
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3842e835490cdf17013b30a788f6311bdcfd0571
+refs/heads/master: 95cc2c70c139936a2142bcd583da8af6f9d88efb
diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c
@@ -2479,8 +2479,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	}
 
 	pci_set_master(pdev);
-	return ata_host_activate(host, pdev->irq, ipriv->irq_handler,
-				 IRQF_SHARED, ipriv->sht);
+	return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);
 }
 
 #ifdef CONFIG_PM