From 8ac50a4393ab1ac3950931c06fe7b81c67b76d1e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 9 Oct 2010 13:26:12 -0700
Subject: [PATCH] --- yaml --- r: 220262 b: refs/heads/master c:
 cf10700bf8047f0668dd874b607f89516612e6c7 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/phison/phison.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 61333b37f125..72f81085c222 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edae01b94a846b39664420fe0c7561a594bb50a2
+refs/heads/master: cf10700bf8047f0668dd874b607f89516612e6c7
diff --git a/trunk/drivers/staging/phison/phison.c b/trunk/drivers/staging/phison/phison.c
index 42783d7367e3..677152044f45 100644
--- a/trunk/drivers/staging/phison/phison.c
+++ b/trunk/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, 0);
+	ret = ata_pci_bmdma_init_one(pdev, ppi, &phison_sht, NULL, 0);
 
 	dev_dbg(&pdev->dev, "phison_init_one(), ret = %x\n", ret);