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
/
ata_generic.c
diff --git
a/drivers/ata/ata_generic.c
b/drivers/ata/ata_generic.c
index
33fb614
..
573158a
100644
(file)
--- a/
drivers/ata/ata_generic.c
+++ b/
drivers/ata/ata_generic.c
@@
-155,7
+155,7
@@
static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
return rc;
pcim_pin_device(dev);
}
return rc;
pcim_pin_device(dev);
}
- return ata_pci_
sff
_init_one(dev, ppi, &generic_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(dev, ppi, &generic_sht, NULL, 0);
}
static struct pci_device_id ata_generic[] = {
}
static struct pci_device_id ata_generic[] = {