projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_sis.c
diff --git
a/drivers/ata/pata_sis.c
b/drivers/ata/pata_sis.c
index
5c30d56
..
b670803
100644
(file)
--- a/
drivers/ata/pata_sis.c
+++ b/
drivers/ata/pata_sis.c
@@
-826,7
+826,7
@@
static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
sis_fixup(pdev, chipset);
- return ata_pci_sff_init_one(pdev, ppi, &sis_sht, chipset);
+ return ata_pci_sff_init_one(pdev, ppi, &sis_sht, chipset
, 0
);
}
#ifdef CONFIG_PM