git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
ata
/
sata_sis.c
diff --git
a/drivers/ata/sata_sis.c
b/drivers/ata/sata_sis.c
index
f8a91bf
..
2bfe3ae
100644
(file)
--- a/
drivers/ata/sata_sis.c
+++ b/
drivers/ata/sata_sis.c
@@
-279,7
+279,7
@@
static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
break;
}
break;
}
- rc = ata_pci_
sff
_prepare_host(pdev, ppi, &host);
+ rc = ata_pci_
bmdma
_prepare_host(pdev, ppi, &host);
if (rc)
return rc;
if (rc)
return rc;
@@
-308,7
+308,7
@@
static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
pci_intx(pdev, 1);
pci_set_master(pdev);
pci_intx(pdev, 1);
- return ata_host_activate(host, pdev->irq, ata_
sff
_interrupt,
+ return ata_host_activate(host, pdev->irq, ata_
bmdma
_interrupt,
IRQF_SHARED, &sis_sht);
}
IRQF_SHARED, &sis_sht);
}