[libata reset-seq] build and merge fixes
[sfrench/cifs-2.6.git] / drivers / ata / pata_sis.c
index 7c6b58223c79eebccc481c5ddae93c5709353983..f5838cc11728602e8445ba126499b821d12cbab4 100644 (file)
@@ -137,7 +137,7 @@ static int sis_66_cable_detect(struct ata_port *ap)
  *     Set up cable type and use generic probe init
  */
 
-static int sis_old_pre_reset(struct ata_port *ap, unsigned long deadline)
+static int sis_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
        static const struct pci_bits sis_enable_bits[] = {
                { 0x4aU, 1U, 0x02UL, 0x02UL },  /* port 0 */