]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: ide-cs id_table update
authorPavel Roskin <proski@gnu.org>
Thu, 28 Jul 2005 08:07:19 +0000 (01:07 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 28 Jul 2005 15:38:59 +0000 (08:38 -0700)
SanDisk ConnectPlus has two functions.  Function 0 is prism2 card, currently
only supported by HostAP (not in the kernel).  Function 1 is 128M flash,
supported by ide-cs.  This patch adds an entry for function 1 to ide-cs.c.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/ide/legacy/ide-cs.c

index aac59751e1b46b01f919698d485c916fe08700bc..07ec76c3bae7c54cf5f0ce3fefb4ed0a1d6cde1d 100644 (file)
@@ -481,6 +481,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_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
        PCMCIA_DEVICE_NULL,
 };
 MODULE_DEVICE_TABLE(pcmcia, ide_ids);