diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-10 06:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-10 06:55:26 -0400 |
| commit | 6a2e42ad0f7ac0f4093b96ed0c6744f09bdfce1d (patch) | |
| tree | 4e8a07ebf250f287c363ec3931247448827c1ba6 /drivers | |
| parent | 8b881b0410de0f72a43e814393abf3a4cb29ebb4 (diff) | |
| parent | 51704c609fcf256dacfcfae3622eb6ef53ac5b48 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/pdc_adma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index d1f38c32aa15..efc8fff1d250 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c | |||
| @@ -183,7 +183,8 @@ static struct ata_port_info adma_port_info[] = { | |||
| 183 | { | 183 | { |
| 184 | .sht = &adma_ata_sht, | 184 | .sht = &adma_ata_sht, |
| 185 | .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | | 185 | .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | |
| 186 | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO, | 186 | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | |
| 187 | ATA_FLAG_PIO_POLLING, | ||
| 187 | .pio_mask = 0x10, /* pio4 */ | 188 | .pio_mask = 0x10, /* pio4 */ |
| 188 | .udma_mask = 0x1f, /* udma0-4 */ | 189 | .udma_mask = 0x1f, /* udma0-4 */ |
| 189 | .port_ops = &adma_ata_ops, | 190 | .port_ops = &adma_ata_ops, |