[libata reset-seq] build and merge fixes

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik
2007-03-09 09:41:19 -05:00
parent 31daabda16
commit 27c78b372d
3 changed files with 5 additions and 3 deletions

View 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 */