diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-09 17:11:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-09 17:11:53 +0100 |
| commit | 548b84166917d6f5e2296123b85ad24aecd3801d (patch) | |
| tree | 0ab0300e23a02df0fe3c0579627e4998bb122c00 /drivers/ata/pata_sis.c | |
| parent | MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer (diff) | |
| parent | Linux 2.6.34-rc1 (diff) | |
| download | linux-548b84166917d6f5e2296123b85ad24aecd3801d.tar.xz linux-548b84166917d6f5e2296123b85ad24aecd3801d.zip | |
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts:
tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/ata/pata_sis.c')
| -rw-r--r-- | drivers/ata/pata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 5c30d56dec84..b6708032f321 100644 --- 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 |