git.openpandora.org
/
pandora-kernel.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...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_hpt366.c
diff --git
a/drivers/ata/pata_hpt366.c
b/drivers/ata/pata_hpt366.c
index
8580eb3
..
7688868
100644
(file)
--- a/
drivers/ata/pata_hpt366.c
+++ b/
drivers/ata/pata_hpt366.c
@@
-361,7
+361,7
@@
static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
break;
}
/* Now kick off ATA set up */
- return ata_pci_
sff
_init_one(dev, ppi, &hpt36x_sht, hpriv, 0);
+ return ata_pci_
bmdma
_init_one(dev, ppi, &hpt36x_sht, hpriv, 0);
}
#ifdef CONFIG_PM