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
pata_cs5535: add pci id for AMD based CS5535 controllers
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
pata_cmd64x.c
diff --git
a/drivers/ata/pata_cmd64x.c
b/drivers/ata/pata_cmd64x.c
index
ddd09b7
..
f98dffe
100644
(file)
--- a/
drivers/ata/pata_cmd64x.c
+++ b/
drivers/ata/pata_cmd64x.c
@@
-1,7
+1,7
@@
/*
* pata_cmd64x.c - CMD64x PATA for new ATA layer
* (C) 2005 Red Hat Inc
/*
* pata_cmd64x.c - CMD64x PATA for new ATA layer
* (C) 2005 Red Hat Inc
- * Alan Cox <alan@
redhat.com
>
+ * Alan Cox <alan@
lxorguk.ukuu.org.uk
>
*
* Based upon
* linux/drivers/ide/pci/cmd64x.c Version 1.30 Sept 10, 2002
*
* Based upon
* linux/drivers/ide/pci/cmd64x.c Version 1.30 Sept 10, 2002
@@
-299,40
+299,40
@@
static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
static const struct ata_port_info cmd_info[6] = {
{ /* CMD 643 - no UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
static const struct ata_port_info cmd_info[6] = {
{ /* CMD 643 - no UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 with broken UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 with broken UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 with working UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 with working UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.udma_mask = ATA_UDMA2,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 rev 1 */
.flags = ATA_FLAG_SLAVE_POSS,
.udma_mask = ATA_UDMA2,
.port_ops = &cmd64x_port_ops
},
{ /* CMD 646 rev 1 */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.port_ops = &cmd646r1_port_ops
},
{ /* CMD 648 */
.flags = ATA_FLAG_SLAVE_POSS,
.port_ops = &cmd646r1_port_ops
},
{ /* CMD 648 */
.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 = &cmd648_port_ops
},
{ /* CMD 649 */
.flags = ATA_FLAG_SLAVE_POSS,
.udma_mask = ATA_UDMA4,
.port_ops = &cmd648_port_ops
},
{ /* CMD 649 */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.udma_mask = ATA_UDMA5,
.port_ops = &cmd648_port_ops
}
.udma_mask = ATA_UDMA5,
.port_ops = &cmd648_port_ops
}