diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 14:42:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 14:42:04 -0700 |
| commit | c19f83669a02d4fa047d0d40f518e90f6f19c4c6 (patch) | |
| tree | 5cf1113408afbe617a39a1ccaed7860bab6193d2 /drivers/ata/pata_ninja32.c | |
| parent | 05fa199d45c54a9bda7aa3ae6537253d6f097aa9 (diff) | |
| parent | e3cf95dd6d352954b663d2934110d6e30af2406d (diff) | |
| download | blackbird-op-linux-c19f83669a02d4fa047d0d40f518e90f6f19c4c6.tar.gz blackbird-op-linux-c19f83669a02d4fa047d0d40f518e90f6f19c4c6.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: Report 16/32bit PIO as best we can
libata: use ATA_ID_CFA_*
pata_legacy: fix no device fail path
pata_hpt37x: fix HPT370 DMA timeouts
libata: handle SEMB signature better
Diffstat (limited to 'drivers/ata/pata_ninja32.c')
| -rw-r--r-- | drivers/ata/pata_ninja32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index 0fb6b1b1e634..dd53a66b19e3 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c @@ -44,7 +44,7 @@ #include <linux/libata.h> #define DRV_NAME "pata_ninja32" -#define DRV_VERSION "0.1.3" +#define DRV_VERSION "0.1.5" /** @@ -86,6 +86,7 @@ static struct ata_port_operations ninja32_port_ops = { .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, .set_piomode = ninja32_set_piomode, + .sff_data_xfer = ata_sff_data_xfer32 }; static void ninja32_program(void __iomem *base) @@ -144,6 +145,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) ap->ioaddr.altstatus_addr = base + 0x1E; ap->ioaddr.bmdma_addr = base; ata_sff_std_ports(&ap->ioaddr); + ap->pflags = ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE; ninja32_program(base); /* FIXME: Should we disable them at remove ? */ |
