From 27c78b372d05e47bbd059c9bb003c6d716abff54 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 9 Mar 2007 09:41:19 -0500 Subject: [libata reset-seq] build and merge fixes Signed-off-by: Jeff Garzik --- drivers/ata/pata_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/ata/pata_sis.c') diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 7c6b58223c7..f5838cc1172 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -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 */ -- cgit v1.2.3