summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 18:58:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 18:58:37 -0800
commitd659fc14cbd39fef625072819c6968044975fda7 (patch)
treeb9e7f3e251a37e23708012943168f2a3f9383c82 /drivers/ide
parent9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff)
parentb1769450da0eeae2d95aae5496acbdf4c6ba89b2 (diff)
downloadop-kernel-dev-d659fc14cbd39fef625072819c6968044975fda7.zip
op-kernel-dev-d659fc14cbd39fef625072819c6968044975fda7.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: ensure correct logging in do_io_probe pcmcia: add another pata/ide ID pcmcia: add braces in error path pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() pcmcia: setup resource information for pseudo multifunction devices. pcmcia: fix indentation & braces disagreement - add braces
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index cb199c8..f50210f 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -444,6 +444,7 @@ static struct pcmcia_device_id ide_ids[] = {
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_PROD_ID2("Flash Card", 0x5a362506),
PCMCIA_DEVICE_NULL,
};
MODULE_DEVICE_TABLE(pcmcia, ide_ids);
OpenPOWER on IntegriCloud