The patch titled

     pcmcia: more IDs for ide_cs

has been added to the -mm tree.  Its filename is

     pcmcia-more-ids-for-ide_cs.patch

Patches currently in -mm which might be from [EMAIL PROTECTED] are

pcmcia-reduce-dsc-stack-footprint.patch
yenta-share-code-with-pci-core.patch
fix-pcmcia_request_irq-for-multifunction-card.patch
pcmcia-yenta-avoid-pci-write-posting-problem.patch
yenta-auto-tune-ene-bridges-for-cb-cards.patch
pcmcia-yenta-dont-mess-with-bridge-control-register.patch
pcmcia-remove-unused-client_t.patch
pcmcia-remove-unused-vpp1-vpp2-and-vcc.patch
pcmcia-omap-cf-controller.patch
pcmcia-more-ids-for-ide_cs.patch
pcmcia-add-pcmcia-to-irq-information.patch



From: Dominik Brodowski <[EMAIL PROTECTED]>

(Partly From: David Brownell <[EMAIL PROTECTED]> )

Make ID-CS recognize the CF card manufacturer records for Samsung, Lexar and
STI.

Signed-off-by: Dominik Brodowski <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/ide/legacy/ide-cs.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -puN drivers/ide/legacy/ide-cs.c~pcmcia-more-ids-for-ide_cs 
drivers/ide/legacy/ide-cs.c
--- devel/drivers/ide/legacy/ide-cs.c~pcmcia-more-ids-for-ide_cs        
2005-08-29 22:30:43.000000000 -0700
+++ devel-akpm/drivers/ide/legacy/ide-cs.c      2005-08-29 22:30:43.000000000 
-0700
@@ -454,9 +454,12 @@ int ide_event(event_t event, int priorit
 static struct pcmcia_device_id ide_ids[] = {
        PCMCIA_DEVICE_FUNC_ID(4),
        PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
+       PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),
+       PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
        PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
+       PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),        /* Samsung */
        PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001),
-       PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),
+       PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200),        /* Lexar */
        PCMCIA_DEVICE_PROD_ID123("Caravelle", "PSC-IDE ", "PSC000", 0x8c36137c, 
0xd0693ab8, 0x2768a9f0),
        PCMCIA_DEVICE_PROD_ID123("CDROM", "IDE", "MCD-601p", 0x1b9179ca, 
0xede88951, 0x0d902f74),
        PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 
0x1907960c, 0xf7fde8b9),
@@ -481,6 +484,7 @@ static struct pcmcia_device_id ide_ids[]
        PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
        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),
        PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 
0x74be00c6),
        PCMCIA_DEVICE_NULL,
 };
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to