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 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
ata_piix.c
diff --git
a/drivers/ata/ata_piix.c
b/drivers/ata/ata_piix.c
index
73685df
..
7409f98
100644
(file)
--- a/
drivers/ata/ata_piix.c
+++ b/
drivers/ata/ata_piix.c
@@
-1589,7
+1589,7
@@
static int __devinit piix_init_one(struct pci_dev *pdev,
hpriv->map = piix_init_sata_map(pdev, port_info,
piix_map_db_table[ent->driver_data]);
- rc = ata_pci_
sff
_prepare_host(pdev, ppi, &host);
+ rc = ata_pci_
bmdma
_prepare_host(pdev, ppi, &host);
if (rc)
return rc;
host->private_data = hpriv;