[libata reset-seq] build and merge fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user