aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_sis.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-03-09 09:41:19 -0500
committerJeff Garzik <jeff@garzik.org>2007-05-01 07:49:54 -0400
commit27c78b372d05e47bbd059c9bb003c6d716abff54 (patch)
tree3d6880b48557689dbe67c88cca952636a4554c5b /drivers/ata/pata_sis.c
parent31daabda16063b64a99a526242add727601e43c3 (diff)
downloadkernel_samsung_smdk4412-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.gz
kernel_samsung_smdk4412-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.bz2
kernel_samsung_smdk4412-27c78b372d05e47bbd059c9bb003c6d716abff54.zip
[libata reset-seq] build and merge fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_sis.c')
-rw-r--r--drivers/ata/pata_sis.c2
1 files changed, 1 insertions, 1 deletions
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 */