aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-09-09 16:03:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:48 -0400
commitd3feb1844ad33911ab1fe9df1ead66082b3bce9b (patch)
treedd540e39b2c02229b0f5f868dadeb1939e20ffcf /drivers
parentf74e48a51c38f54fa26eb86a7a42f592156eccc2 (diff)
[PATCH] pcmcia: more IDs for ide_cs
(Partly From: David Brownell <dbrownell@users.sourceforge.net> ) Make ID-CS recognize the CF card manufacturer records for Samsung, Lexar and STI. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/legacy/ide-cs.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index f1d1ec4e9677..dc0841b2721c 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -454,9 +454,12 @@ int ide_event(event_t event, int priority,
454static struct pcmcia_device_id ide_ids[] = { 454static struct pcmcia_device_id ide_ids[] = {
455 PCMCIA_DEVICE_FUNC_ID(4), 455 PCMCIA_DEVICE_FUNC_ID(4),
456 PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704), 456 PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
457 PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),
458 PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000), /* Toshiba */
457 PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d), 459 PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
460 PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000), /* Samsung */
458 PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001), 461 PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001),
459 PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401), 462 PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200), /* Lexar */
460 PCMCIA_DEVICE_PROD_ID123("Caravelle", "PSC-IDE ", "PSC000", 0x8c36137c, 0xd0693ab8, 0x2768a9f0), 463 PCMCIA_DEVICE_PROD_ID123("Caravelle", "PSC-IDE ", "PSC000", 0x8c36137c, 0xd0693ab8, 0x2768a9f0),
461 PCMCIA_DEVICE_PROD_ID123("CDROM", "IDE", "MCD-601p", 0x1b9179ca, 0xede88951, 0x0d902f74), 464 PCMCIA_DEVICE_PROD_ID123("CDROM", "IDE", "MCD-601p", 0x1b9179ca, 0xede88951, 0x0d902f74),
462 PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9), 465 PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
@@ -481,6 +484,7 @@ static struct pcmcia_device_id ide_ids[] = {
481 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), 484 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
482 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), 485 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
483 PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), 486 PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
487 PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
484 PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), 488 PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
485 PCMCIA_DEVICE_NULL, 489 PCMCIA_DEVICE_NULL,
486}; 490};