diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:22 -0400 |
commit | c36ad397a30fcf9369d82584324cc24189eb6b1c (patch) | |
tree | a5cbb451a2e9ea3ea12b6d279c72d77ac96c3028 /drivers/scsi/pcmcia | |
parent | c903e41e67046e7f52bbc404bd5aa654d12540cc (diff) | |
parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/aha152x_stub.c | 11 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/fdomain_stub.c | 10 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 13 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 22 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 9 |
5 files changed, 65 insertions, 0 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index e60b4c0a8427..f1f6bf596dc9 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c | |||
@@ -318,6 +318,16 @@ static int aha152x_event(event_t event, int priority, | |||
318 | return 0; | 318 | return 0; |
319 | } | 319 | } |
320 | 320 | ||
321 | static struct pcmcia_device_id aha152x_ids[] = { | ||
322 | PCMCIA_DEVICE_PROD_ID123("New Media", "SCSI", "Bus Toaster", 0xcdf7e4cc, 0x35f26476, 0xa8851d6e), | ||
323 | PCMCIA_DEVICE_PROD_ID123("NOTEWORTHY", "SCSI", "Bus Toaster", 0xad89c6e8, 0x35f26476, 0xa8851d6e), | ||
324 | PCMCIA_DEVICE_PROD_ID12("Adaptec, Inc.", "APA-1460 SCSI Host Adapter", 0x24ba9738, 0x3a3c3d20), | ||
325 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "Multimedia Sound/SCSI", 0x085a850b, 0x80a6535c), | ||
326 | PCMCIA_DEVICE_PROD_ID12("NOTEWORTHY", "NWCOMB02 SCSI/AUDIO COMBO CARD", 0xad89c6e8, 0x5f9a615b), | ||
327 | PCMCIA_DEVICE_NULL, | ||
328 | }; | ||
329 | MODULE_DEVICE_TABLE(pcmcia, aha152x_ids); | ||
330 | |||
321 | static struct pcmcia_driver aha152x_cs_driver = { | 331 | static struct pcmcia_driver aha152x_cs_driver = { |
322 | .owner = THIS_MODULE, | 332 | .owner = THIS_MODULE, |
323 | .drv = { | 333 | .drv = { |
@@ -325,6 +335,7 @@ static struct pcmcia_driver aha152x_cs_driver = { | |||
325 | }, | 335 | }, |
326 | .attach = aha152x_attach, | 336 | .attach = aha152x_attach, |
327 | .detach = aha152x_detach, | 337 | .detach = aha152x_detach, |
338 | .id_table = aha152x_ids, | ||
328 | }; | 339 | }; |
329 | 340 | ||
330 | static int __init init_aha152x_cs(void) | 341 | static int __init init_aha152x_cs(void) |
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 3df7bc72e354..853e6ee9b71a 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -299,6 +299,15 @@ static int fdomain_event(event_t event, int priority, | |||
299 | return 0; | 299 | return 0; |
300 | } /* fdomain_event */ | 300 | } /* fdomain_event */ |
301 | 301 | ||
302 | |||
303 | static struct pcmcia_device_id fdomain_ids[] = { | ||
304 | PCMCIA_DEVICE_PROD_ID12("IBM Corp.", "SCSI PCMCIA Card", 0xe3736c88, 0x859cad20), | ||
305 | PCMCIA_DEVICE_PROD_ID1("SCSI PCMCIA Adapter Card", 0x8dacb57e), | ||
306 | PCMCIA_DEVICE_PROD_ID12(" SIMPLE TECHNOLOGY Corporation", "SCSI PCMCIA Credit Card Controller", 0x182bdafe, 0xc80d106f), | ||
307 | PCMCIA_DEVICE_NULL, | ||
308 | }; | ||
309 | MODULE_DEVICE_TABLE(pcmcia, fdomain_ids); | ||
310 | |||
302 | static struct pcmcia_driver fdomain_cs_driver = { | 311 | static struct pcmcia_driver fdomain_cs_driver = { |
303 | .owner = THIS_MODULE, | 312 | .owner = THIS_MODULE, |
304 | .drv = { | 313 | .drv = { |
@@ -306,6 +315,7 @@ static struct pcmcia_driver fdomain_cs_driver = { | |||
306 | }, | 315 | }, |
307 | .attach = fdomain_attach, | 316 | .attach = fdomain_attach, |
308 | .detach = fdomain_detach, | 317 | .detach = fdomain_detach, |
318 | .id_table = fdomain_ids, | ||
309 | }; | 319 | }; |
310 | 320 | ||
311 | static int __init init_fdomain_cs(void) | 321 | static int __init init_fdomain_cs(void) |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 3dddb323e718..91b3f28e7a19 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -2125,6 +2125,18 @@ static int nsp_cs_event(event_t event, | |||
2125 | * module entry point | 2125 | * module entry point |
2126 | *====================================================================*/ | 2126 | *====================================================================*/ |
2127 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68)) | 2127 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68)) |
2128 | static struct pcmcia_device_id nsp_cs_ids[] = { | ||
2129 | PCMCIA_DEVICE_PROD_ID123("IO DATA", "CBSC16 ", "1", 0x547e66dc, 0x0d63a3fd, 0x51de003a), | ||
2130 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-001", "1", 0x534c02bc, 0x52008408, 0x51de003a), | ||
2131 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-002", "1", 0x534c02bc, 0xcb09d5b2, 0x51de003a), | ||
2132 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-003", "1", 0x534c02bc, 0xbc0ee524, 0x51de003a), | ||
2133 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-004", "1", 0x534c02bc, 0x226a7087, 0x51de003a), | ||
2134 | PCMCIA_DEVICE_PROD_ID123("WBT", "NinjaSCSI-3", "R1.0", 0xc7ba805f, 0xfdc7c97d, 0x6973710e), | ||
2135 | PCMCIA_DEVICE_PROD_ID123("WORKBIT", "UltraNinja-16", "1", 0x28191418, 0xb70f4b09, 0x51de003a), | ||
2136 | PCMCIA_DEVICE_NULL | ||
2137 | }; | ||
2138 | MODULE_DEVICE_TABLE(pcmcia, nsp_cs_ids); | ||
2139 | |||
2128 | static struct pcmcia_driver nsp_driver = { | 2140 | static struct pcmcia_driver nsp_driver = { |
2129 | .owner = THIS_MODULE, | 2141 | .owner = THIS_MODULE, |
2130 | .drv = { | 2142 | .drv = { |
@@ -2132,6 +2144,7 @@ static struct pcmcia_driver nsp_driver = { | |||
2132 | }, | 2144 | }, |
2133 | .attach = nsp_cs_attach, | 2145 | .attach = nsp_cs_attach, |
2134 | .detach = nsp_cs_detach, | 2146 | .detach = nsp_cs_detach, |
2147 | .id_table = nsp_cs_ids, | ||
2135 | }; | 2148 | }; |
2136 | #endif | 2149 | #endif |
2137 | 2150 | ||
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index a0175f5d11cd..0dcf41102abf 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -395,6 +395,27 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg | |||
395 | return 0; | 395 | return 0; |
396 | } /* qlogic_event */ | 396 | } /* qlogic_event */ |
397 | 397 | ||
398 | static struct pcmcia_device_id qlogic_ids[] = { | ||
399 | PCMCIA_DEVICE_PROD_ID12("EIger Labs", "PCMCIA-to-SCSI Adapter", 0x88395fa7, 0x33b7a5e6), | ||
400 | PCMCIA_DEVICE_PROD_ID12("EPSON", "SCSI-2 PC Card SC200", 0xd361772f, 0x299d1751), | ||
401 | PCMCIA_DEVICE_PROD_ID12("MACNICA", "MIRACLE SCSI-II mPS110", 0x20841b68, 0xab3c3b6d), | ||
402 | PCMCIA_DEVICE_PROD_ID12("MIDORI ELECTRONICS ", "CN-SC43", 0x6534382a, 0xd67eee79), | ||
403 | PCMCIA_DEVICE_PROD_ID12("NEC", "PC-9801N-J03R", 0x18df0ba0, 0x24662e8a), | ||
404 | PCMCIA_DEVICE_PROD_ID12("KME ", "KXLC003", 0x82375a27, 0xf68e5bf7), | ||
405 | PCMCIA_DEVICE_PROD_ID12("KME ", "KXLC004", 0x82375a27, 0x68eace54), | ||
406 | PCMCIA_DEVICE_PROD_ID12("KME", "KXLC101", 0x3faee676, 0x194250ec), | ||
407 | PCMCIA_DEVICE_PROD_ID12("QLOGIC CORPORATION", "pc05", 0xd77b2930, 0xa85b2735), | ||
408 | PCMCIA_DEVICE_PROD_ID12("QLOGIC CORPORATION", "pc05 rev 1.10", 0xd77b2930, 0x70f8b5f8), | ||
409 | PCMCIA_DEVICE_PROD_ID123("KME", "KXLC002", "00", 0x3faee676, 0x81896b61, 0xf99f065f), | ||
410 | PCMCIA_DEVICE_PROD_ID12("RATOC System Inc.", "SCSI2 CARD 37", 0x85c10e17, 0x1a2640c1), | ||
411 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "SCSC200A PC CARD SCSI", 0xb4585a1a, 0xa6f06ebe), | ||
412 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "SCSC200B PC CARD SCSI-10", 0xb4585a1a, 0x0a88dea0), | ||
413 | /* these conflict with other cards! */ | ||
414 | /* PCMCIA_DEVICE_PROD_ID123("MACNICA", "MIRACLE SCSI", "mPS100", 0x20841b68, 0xf8dedaeb, 0x89f7fafb), */ | ||
415 | /* PCMCIA_DEVICE_PROD_ID123("MACNICA", "MIRACLE SCSI", "mPS100", 0x20841b68, 0xf8dedaeb, 0x89f7fafb), */ | ||
416 | PCMCIA_DEVICE_NULL, | ||
417 | }; | ||
418 | MODULE_DEVICE_TABLE(pcmcia, qlogic_ids); | ||
398 | 419 | ||
399 | static struct pcmcia_driver qlogic_cs_driver = { | 420 | static struct pcmcia_driver qlogic_cs_driver = { |
400 | .owner = THIS_MODULE, | 421 | .owner = THIS_MODULE, |
@@ -403,6 +424,7 @@ static struct pcmcia_driver qlogic_cs_driver = { | |||
403 | }, | 424 | }, |
404 | .attach = qlogic_attach, | 425 | .attach = qlogic_attach, |
405 | .detach = qlogic_detach, | 426 | .detach = qlogic_detach, |
427 | .id_table = qlogic_ids, | ||
406 | }; | 428 | }; |
407 | 429 | ||
408 | static int __init init_qlogic_cs(void) | 430 | static int __init init_qlogic_cs(void) |
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 1667da9508b4..7d4b16b6797d 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -999,6 +999,14 @@ MODULE_AUTHOR("Bob Tracy <rct@frus.com>"); | |||
999 | MODULE_DESCRIPTION("SYM53C500 PCMCIA SCSI driver"); | 999 | MODULE_DESCRIPTION("SYM53C500 PCMCIA SCSI driver"); |
1000 | MODULE_LICENSE("GPL"); | 1000 | MODULE_LICENSE("GPL"); |
1001 | 1001 | ||
1002 | static struct pcmcia_device_id sym53c500_ids[] = { | ||
1003 | PCMCIA_DEVICE_PROD_ID12("BASICS by New Media Corporation", "SCSI Sym53C500", 0x23c78a9d, 0x0099e7f7), | ||
1004 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "SCSI Bus Toaster Sym53C500", 0x085a850b, 0x45432eb8), | ||
1005 | PCMCIA_DEVICE_PROD_ID2("SCSI9000", 0x21648f44), | ||
1006 | PCMCIA_DEVICE_NULL, | ||
1007 | }; | ||
1008 | MODULE_DEVICE_TABLE(pcmcia, sym53c500_ids); | ||
1009 | |||
1002 | static struct pcmcia_driver sym53c500_cs_driver = { | 1010 | static struct pcmcia_driver sym53c500_cs_driver = { |
1003 | .owner = THIS_MODULE, | 1011 | .owner = THIS_MODULE, |
1004 | .drv = { | 1012 | .drv = { |
@@ -1006,6 +1014,7 @@ static struct pcmcia_driver sym53c500_cs_driver = { | |||
1006 | }, | 1014 | }, |
1007 | .attach = SYM53C500_attach, | 1015 | .attach = SYM53C500_attach, |
1008 | .detach = SYM53C500_detach, | 1016 | .detach = SYM53C500_detach, |
1017 | .id_table = sym53c500_ids, | ||
1009 | }; | 1018 | }; |
1010 | 1019 | ||
1011 | static int __init | 1020 | static int __init |