summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-06-02 22:45:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:56 -0700
commitb079fa27d946cf7382ebcd06148782d62103e51a (patch)
treeee97cd3443469ccd52f979af76ef1899cbd7a13a /drivers/staging
parent89a2c2085bfddde2d4fe2264a3f040cb054ed145 (diff)
downloadblackbird-obmc-linux-b079fa27d946cf7382ebcd06148782d62103e51a.tar.gz
blackbird-obmc-linux-b079fa27d946cf7382ebcd06148782d62103e51a.zip
Staging: pata_rdc: convert code to work in 2.6.29
This fixes build problems in the pata_rdc driver due to api changes in the libata layer. Cc: Kevin Huang <Kevin.Huang@rdc.com.tw> Cc: Tomy Wang <Tomy.Wang@rdc.com.tw> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/pata_rdc/pata_rdc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/pata_rdc/pata_rdc.c b/drivers/staging/pata_rdc/pata_rdc.c
index 657e9971f41c..5bc74ed05328 100644
--- a/drivers/staging/pata_rdc/pata_rdc.c
+++ b/drivers/staging/pata_rdc/pata_rdc.c
@@ -148,7 +148,7 @@ static int __devinit rdc_init_one(
{
//struct device *dev = &pdev->dev;
struct ata_port_info port_info[2];
- struct ata_port_info *ppinfo[] = { &port_info[0], &port_info[1] };
+ const struct ata_port_info *ppinfo[] = { &port_info[0], &port_info[1] };
int rc;
@@ -174,7 +174,7 @@ static int __devinit rdc_init_one(
pci_intx(pdev, 1); // enable interrupt
- return ata_pci_init_one(pdev, ppinfo);
+ return ata_pci_sff_init_one(pdev, ppinfo, &rdc_pata_sht, NULL);
}
// callback function for ata_port
OpenPOWER on IntegriCloud