diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /drivers/ata/pata_pdc202xx_old.c | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'drivers/ata/pata_pdc202xx_old.c')
| -rw-r--r-- | drivers/ata/pata_pdc202xx_old.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c index 799a6a09871..5fedb3d4032 100644 --- a/drivers/ata/pata_pdc202xx_old.c +++ b/drivers/ata/pata_pdc202xx_old.c | |||
| @@ -291,22 +291,22 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id | |||
| 291 | static const struct ata_port_info info[3] = { | 291 | static const struct ata_port_info info[3] = { |
| 292 | { | 292 | { |
| 293 | .flags = ATA_FLAG_SLAVE_POSS, | 293 | .flags = ATA_FLAG_SLAVE_POSS, |
| 294 | .pio_mask = 0x1f, | 294 | .pio_mask = ATA_PIO4, |
| 295 | .mwdma_mask = 0x07, | 295 | .mwdma_mask = ATA_MWDMA2, |
| 296 | .udma_mask = ATA_UDMA2, | 296 | .udma_mask = ATA_UDMA2, |
| 297 | .port_ops = &pdc2024x_port_ops | 297 | .port_ops = &pdc2024x_port_ops |
| 298 | }, | 298 | }, |
| 299 | { | 299 | { |
| 300 | .flags = ATA_FLAG_SLAVE_POSS, | 300 | .flags = ATA_FLAG_SLAVE_POSS, |
| 301 | .pio_mask = 0x1f, | 301 | .pio_mask = ATA_PIO4, |
| 302 | .mwdma_mask = 0x07, | 302 | .mwdma_mask = ATA_MWDMA2, |
| 303 | .udma_mask = ATA_UDMA4, | 303 | .udma_mask = ATA_UDMA4, |
| 304 | .port_ops = &pdc2026x_port_ops | 304 | .port_ops = &pdc2026x_port_ops |
| 305 | }, | 305 | }, |
| 306 | { | 306 | { |
| 307 | .flags = ATA_FLAG_SLAVE_POSS, | 307 | .flags = ATA_FLAG_SLAVE_POSS, |
| 308 | .pio_mask = 0x1f, | 308 | .pio_mask = ATA_PIO4, |
| 309 | .mwdma_mask = 0x07, | 309 | .mwdma_mask = ATA_MWDMA2, |
| 310 | .udma_mask = ATA_UDMA5, | 310 | .udma_mask = ATA_UDMA5, |
| 311 | .port_ops = &pdc2026x_port_ops | 311 | .port_ops = &pdc2026x_port_ops |
| 312 | } | 312 | } |