From: Pavel Roskin <proski@gnu.org>
Date: Thu, 28 Jul 2005 08:07:19 +0000 (-0700)
Subject: [PATCH] pcmcia: ide-cs id_table update
X-Git-Tag: firefly_0821_release~42657
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=698e22c4bf7dad25d63f5c2ec6ca07047579c434;p=firefly-linux-kernel-4.4.55.git

[PATCH] pcmcia: ide-cs id_table update

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

diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index aac59751e1b4..07ec76c3bae7 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -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);