From 66371fc41e2bf8fffbf49586431cd521c588be67 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 4 Oct 2006 12:47:14 +0100 Subject: [PATCH] --- yaml --- r: 38475 b: refs/heads/master c: a0a00cbf8ae5cea3d72e28982c06f3270420c657 h: refs/heads/master i: 38473: 31ef7304dd0ea36a1173288f7c76bd8f1ff07d6b 38471: bdb7f11712640a89a4b35c0cd76e038a7cd56163 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_ali.c | 4 ++-- trunk/drivers/ata/pata_pcmcia.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ee683580a331..1e016330f9f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11966adc33fa1504c2d9a78e6fc129e5c87bdee1 +refs/heads/master: a0a00cbf8ae5cea3d72e28982c06f3270420c657 diff --git a/trunk/drivers/ata/pata_ali.c b/trunk/drivers/ata/pata_ali.c index 3f49e38217da..1d695df5860a 100644 --- a/trunk/drivers/ata/pata_ali.c +++ b/trunk/drivers/ata/pata_ali.c @@ -34,7 +34,7 @@ #include #define DRV_NAME "pata_ali" -#define DRV_VERSION "0.6.5" +#define DRV_VERSION "0.6.6" /* * Cable special cases @@ -630,7 +630,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) pci_read_config_byte(pdev, 0x53, &tmp); if (rev <= 0x20) tmp &= ~0x02; - if (rev == 0xc7) + if (rev >= 0xc7) tmp |= 0x03; else tmp |= 0x01; /* CD_ROM enable for DMA */ diff --git a/trunk/drivers/ata/pata_pcmcia.c b/trunk/drivers/ata/pata_pcmcia.c index cb501e145a42..e93ea2702c73 100644 --- a/trunk/drivers/ata/pata_pcmcia.c +++ b/trunk/drivers/ata/pata_pcmcia.c @@ -42,7 +42,7 @@ #define DRV_NAME "pata_pcmcia" -#define DRV_VERSION "0.2.9" +#define DRV_VERSION "0.2.11" /* * Private data structure to glue stuff together @@ -355,6 +355,8 @@ static struct pcmcia_device_id pcmcia_devices[] = { PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),