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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
[pandora-kernel.git]
/
drivers
/
ata
/
pata_artop.c
diff --git
a/drivers/ata/pata_artop.c
b/drivers/ata/pata_artop.c
index
4d066d6
..
ba43f0f
100644
(file)
--- a/
drivers/ata/pata_artop.c
+++ b/
drivers/ata/pata_artop.c
@@
-421,7
+421,7
@@
static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
BUG_ON(ppi[0] == NULL);
BUG_ON(ppi[0] == NULL);
- return ata_pci_
sff
_init_one(pdev, ppi, &artop_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &artop_sht, NULL, 0);
}
static const struct pci_device_id artop_pci_tbl[] = {
}
static const struct pci_device_id artop_pci_tbl[] = {