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
/
pata_serverworks.c
diff --git
a/drivers/ata/pata_serverworks.c
b/drivers/ata/pata_serverworks.c
index
43ea389
..
86dd714
100644
(file)
--- a/
drivers/ata/pata_serverworks.c
+++ b/
drivers/ata/pata_serverworks.c
@@
-460,7
+460,7
@@
static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
ata_pci_bmdma_clear_simplex(pdev);
if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
ata_pci_bmdma_clear_simplex(pdev);
- return ata_pci_
sff
_init_one(pdev, ppi, &serverworks_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &serverworks_sht, NULL, 0);
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM