commit 27c78b372d05e47bbd059c9bb003c6d716abff54
author Jeff Garzik <jeff@garzik.org> Fri Mar 09 09:41:19 2007 -0500
committer Jeff Garzik <jeff@garzik.org> Tue May 01 07:49:54 2007 -0400
tree 3d6880b48557689dbe67c88cca952636a4554c5b
parent 31daabda16063b64a99a526242add727601e43c3

[libata reset-seq] build and merge fixes

Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/ata/pata_sis.c

diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 7c6b582..f5838cc 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -137,7 +137,7 @@
  *	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 */