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/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
ata
/
pata_cmd640.c
diff --git
a/drivers/ata/pata_cmd640.c
b/drivers/ata/pata_cmd640.c
index
5acf9fa
..
6cd5d5d
100644
(file)
--- a/
drivers/ata/pata_cmd640.c
+++ b/
drivers/ata/pata_cmd640.c
@@
-223,7
+223,7
@@
static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
cmd640_hardware_init(pdev);
- return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL);
+ return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL
, 0
);
}
#ifdef CONFIG_PM