git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
pata_via.c
diff --git
a/drivers/ata/pata_via.c
b/drivers/ata/pata_via.c
index
7e3e0a5
..
5e65988
100644
(file)
--- a/
drivers/ata/pata_via.c
+++ b/
drivers/ata/pata_via.c
@@
-627,7
+627,7
@@
static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* We have established the device type, now fire it up */
- return ata_pci_
sff
_init_one(pdev, ppi, &via_sht, (void *)config, 0);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &via_sht, (void *)config, 0);
}
#ifdef CONFIG_PM