diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-03 01:45:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:56 -0400 |
commit | b079fa27d946cf7382ebcd06148782d62103e51a (patch) | |
tree | ee97cd3443469ccd52f979af76ef1899cbd7a13a /drivers | |
parent | 89a2c2085bfddde2d4fe2264a3f040cb054ed145 (diff) |
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')
-rw-r--r-- | drivers/staging/pata_rdc/pata_rdc.c | 4 |
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( | |||
148 | { | 148 | { |
149 | //struct device *dev = &pdev->dev; | 149 | //struct device *dev = &pdev->dev; |
150 | struct ata_port_info port_info[2]; | 150 | struct ata_port_info port_info[2]; |
151 | struct ata_port_info *ppinfo[] = { &port_info[0], &port_info[1] }; | 151 | const struct ata_port_info *ppinfo[] = { &port_info[0], &port_info[1] }; |
152 | 152 | ||
153 | int rc; | 153 | int rc; |
154 | 154 | ||
@@ -174,7 +174,7 @@ static int __devinit rdc_init_one( | |||
174 | 174 | ||
175 | pci_intx(pdev, 1); // enable interrupt | 175 | pci_intx(pdev, 1); // enable interrupt |
176 | 176 | ||
177 | return ata_pci_init_one(pdev, ppinfo); | 177 | return ata_pci_sff_init_one(pdev, ppinfo, &rdc_pata_sht, NULL); |
178 | } | 178 | } |
179 | 179 | ||
180 | // callback function for ata_port | 180 | // callback function for ata_port |