diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 15:55:48 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 15:55:48 +0200 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/ata/pata_netcell.c | |
| parent | [JFFS2] Add support for write-buffer verification. (diff) | |
| parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
| download | linux-db1b39d8b860e3716620c225bc86e0ec41764e34.tar.xz linux-db1b39d8b860e3716620c225bc86e0ec41764e34.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_netcell.c')
| -rw-r--r-- | drivers/ata/pata_netcell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c index 81f563458666..40eb574828bf 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c @@ -94,12 +94,12 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e static int printed_version; static const struct ata_port_info info = { .sht = &netcell_sht, - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, + .flags = ATA_FLAG_SLAVE_POSS, /* Actually we don't really care about these as the firmware deals with it */ .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ - .udma_mask = 0x3f, /* UDMA 133 */ + .udma_mask = ATA_UDMA5, /* UDMA 133 */ .port_ops = &netcell_ops, }; const struct ata_port_info *port_info[] = { &info, NULL }; |