diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-04 07:47:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:15:15 -0400 |
commit | a0a00cbf8ae5cea3d72e28982c06f3270420c657 (patch) | |
tree | f776f8521563e43d274d1a9275097175da8f4ddc /drivers/ata/pata_ali.c | |
parent | 11966adc33fa1504c2d9a78e6fc129e5c87bdee1 (diff) |
[PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync
This fixes support for rev c8 of the ALi/ULi PATA, and keeps pcmcia in
sync so ide_cs and pata_pcmcia are interchangable, both are only changes
to constants.
Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the
field now.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ata/pata_ali.c')
-rw-r--r-- | drivers/ata/pata_ali.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 3f49e38217da..1d695df5860a 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/dmi.h> | 34 | #include <linux/dmi.h> |
35 | 35 | ||
36 | #define DRV_NAME "pata_ali" | 36 | #define DRV_NAME "pata_ali" |
37 | #define DRV_VERSION "0.6.5" | 37 | #define DRV_VERSION "0.6.6" |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Cable special cases | 40 | * Cable special cases |
@@ -630,7 +630,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
630 | pci_read_config_byte(pdev, 0x53, &tmp); | 630 | pci_read_config_byte(pdev, 0x53, &tmp); |
631 | if (rev <= 0x20) | 631 | if (rev <= 0x20) |
632 | tmp &= ~0x02; | 632 | tmp &= ~0x02; |
633 | if (rev == 0xc7) | 633 | if (rev >= 0xc7) |
634 | tmp |= 0x03; | 634 | tmp |= 0x03; |
635 | else | 635 | else |
636 | tmp |= 0x01; /* CD_ROM enable for DMA */ | 636 | tmp |= 0x01; /* CD_ROM enable for DMA */ |