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 /home/davem/src/GIT/linux-2.6/
[cascardo/linux.git]
/
drivers
/
ata
/
pata_amd.c
diff --git
a/drivers/ata/pata_amd.c
b/drivers/ata/pata_amd.c
index
d95eca9
..
620a07c
100644
(file)
--- a/
drivers/ata/pata_amd.c
+++ b/
drivers/ata/pata_amd.c
@@
-574,7
+574,7
@@
static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* And fire it up */
- return ata_pci_
sff
_init_one(pdev, ppi, &amd_sht, hpriv, 0);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &amd_sht, hpriv, 0);
}
#ifdef CONFIG_PM