tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Dominik Brodowski and committed by
Linus Torvalds d3feb184 f74e48a5

+6 -2
+6 -2
drivers/ide/legacy/ide-cs.c
··· 454 454 static struct pcmcia_device_id ide_ids[] = { 455 455 PCMCIA_DEVICE_FUNC_ID(4), 456 456 PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704), 457 - PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d), 458 - PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001), 459 457 PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401), 458 + PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000), /* Toshiba */ 459 + PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d), 460 + PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000), /* Samsung */ 461 + PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001), 462 + PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0200), /* Lexar */ 460 463 PCMCIA_DEVICE_PROD_ID123("Caravelle", "PSC-IDE ", "PSC000", 0x8c36137c, 0xd0693ab8, 0x2768a9f0), 461 464 PCMCIA_DEVICE_PROD_ID123("CDROM", "IDE", "MCD-601p", 0x1b9179ca, 0xede88951, 0x0d902f74), 462 465 PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9), ··· 484 481 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), 485 482 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), 486 483 PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), 484 + PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), 487 485 PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), 488 486 PCMCIA_DEVICE_NULL, 489 487 };