From 0a82103503332dcd94bbbe67faa655f799281ab3 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 14 May 2010 11:48:50 +0200
Subject: [PATCH] --- yaml --- r: 192610 b: refs/heads/master c:
 95cc2c70c139936a2142bcd583da8af6f9d88efb h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_nv.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 773cf8794c7e..47d033375ee6 100644
--- 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
index 2a98b09ab735..9d3dbc8a1184 100644
--- 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