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 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_cs5535.c
diff --git
a/drivers/ata/pata_cs5535.c
b/drivers/ata/pata_cs5535.c
index
8b236af
..
403f561
100644
(file)
--- a/
drivers/ata/pata_cs5535.c
+++ b/
drivers/ata/pata_cs5535.c
@@
-181,8
+181,8
@@
static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
static const struct ata_port_info info = {
.flags = ATA_FLAG_SLAVE_POSS,
{
static const struct ata_port_info info = {
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.udma_mask = ATA_UDMA4,
.port_ops = &cs5535_port_ops
};
.udma_mask = ATA_UDMA4,
.port_ops = &cs5535_port_ops
};
@@
-202,7
+202,8
@@
static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
}
static const struct pci_device_id cs5535[] = {
}
static const struct pci_device_id cs5535[] = {
- { PCI_VDEVICE(NS, 0x002D), },
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },
{ },
};
{ },
};