diff options
| author | Jeff Garzik | 2007-03-09 15:41:19 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2007-05-01 13:49:54 +0200 |
| commit | 27c78b372d05e47bbd059c9bb003c6d716abff54 (patch) | |
| tree | 3d6880b48557689dbe67c88cca952636a4554c5b /drivers/ata/pata_sis.c | |
| parent | libata: reimplement reset sequencing (diff) | |
| download | kernel-qcow2-linux-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.gz kernel-qcow2-linux-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.xz kernel-qcow2-linux-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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 7c6b58223c79..f5838cc11728 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 */ |