From b079fa27d946cf7382ebcd06148782d62103e51a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 2 Jun 2009 22:45:46 -0700 Subject: [PATCH] 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 Cc: Tomy Wang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/pata_rdc/pata_rdc.c | 4 ++-- 1 file 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 -- 2.20.1