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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_optidma.c
diff --git
a/drivers/ata/pata_optidma.c
b/drivers/ata/pata_optidma.c
index
86885a4
..
76b7d12
100644
(file)
--- a/
drivers/ata/pata_optidma.c
+++ b/
drivers/ata/pata_optidma.c
@@
-429,7
+429,7
@@
static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
if (optiplus_with_udma(dev))
ppi[0] = &info_82c700_udma;
- return ata_pci_sff_init_one(dev, ppi, &optidma_sht, NULL);
+ return ata_pci_sff_init_one(dev, ppi, &optidma_sht, NULL
, 0
);
}
static const struct pci_device_id optidma[] = {