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 git://git.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
drivers
/
ata
/
pata_sc1200.c
diff --git
a/drivers/ata/pata_sc1200.c
b/drivers/ata/pata_sc1200.c
index
6b5b63a
..
e2c1825
100644
(file)
--- a/
drivers/ata/pata_sc1200.c
+++ b/
drivers/ata/pata_sc1200.c
@@
-237,7
+237,7
@@
static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
};
const struct ata_port_info *ppi[] = { &info, NULL };
};
const struct ata_port_info *ppi[] = { &info, NULL };
- return ata_pci_
sff
_init_one(dev, ppi, &sc1200_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(dev, ppi, &sc1200_sht, NULL, 0);
}
static const struct pci_device_id sc1200[] = {
}
static const struct pci_device_id sc1200[] = {