diff options
author | S.Caglar Onur <caglar@pardus.org.tr> | 2007-07-04 16:52:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-12 19:34:41 -0400 |
commit | c0e0c19cc9d899da0ee15104907ac158eb94365b (patch) | |
tree | bd568152aa6d65a7ff86c948f7fe0828e16c6e29 /drivers/usb | |
parent | a603c665516a3cb9df6abafad491bef24cc87aa5 (diff) |
USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
Following patch removes trailing whitespaces at the ends of lines and converts
smarttabs/whitespaces into real tabs.
Signed-off-by: S.Caglar Onur <caglar@pardus.org.tr>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 54979c239c63..b6bf31a97b60 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -50,10 +50,10 @@ | |||
50 | /* patch submitted by Vivian Bregier <Vivian.Bregier@imag.fr> | 50 | /* patch submitted by Vivian Bregier <Vivian.Bregier@imag.fr> |
51 | */ | 51 | */ |
52 | UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x0100, | 52 | UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x0100, |
53 | "ATMEL", | 53 | "ATMEL", |
54 | "SND1 Storage", | 54 | "SND1 Storage", |
55 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 55 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
56 | US_FL_IGNORE_RESIDUE), | 56 | US_FL_IGNORE_RESIDUE), |
57 | 57 | ||
58 | /* modified by Tobias Lorenz <tobias.lorenz@gmx.net> */ | 58 | /* modified by Tobias Lorenz <tobias.lorenz@gmx.net> */ |
59 | UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x0200, | 59 | UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x0200, |
@@ -69,18 +69,18 @@ UNUSUAL_DEV( 0x03ee, 0x6906, 0x0003, 0x0003, | |||
69 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 69 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
70 | US_FL_IGNORE_RESIDUE ), | 70 | US_FL_IGNORE_RESIDUE ), |
71 | 71 | ||
72 | UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200, | 72 | UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200, |
73 | "HP", | 73 | "HP", |
74 | "CD-Writer+", | 74 | "CD-Writer+", |
75 | US_SC_8070, US_PR_CB, NULL, 0), | 75 | US_SC_8070, US_PR_CB, NULL, 0), |
76 | 76 | ||
77 | #ifdef CONFIG_USB_STORAGE_USBAT | 77 | #ifdef CONFIG_USB_STORAGE_USBAT |
78 | UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001, | 78 | UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001, |
79 | "HP", | 79 | "HP", |
80 | "CD-Writer+ 8200e", | 80 | "CD-Writer+ 8200e", |
81 | US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), | 81 | US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), |
82 | 82 | ||
83 | UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001, | 83 | UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001, |
84 | "HP", | 84 | "HP", |
85 | "CD-Writer+ CD-4e", | 85 | "CD-Writer+ CD-4e", |
86 | US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), | 86 | US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), |
@@ -115,10 +115,10 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x0113, | |||
115 | 115 | ||
116 | /* Submitted by Ernestas Vaiciukevicius <ernisv@gmail.com> */ | 116 | /* Submitted by Ernestas Vaiciukevicius <ernisv@gmail.com> */ |
117 | UNUSUAL_DEV( 0x0419, 0x0100, 0x0100, 0x0100, | 117 | UNUSUAL_DEV( 0x0419, 0x0100, 0x0100, 0x0100, |
118 | "Samsung Info. Systems America, Inc.", | 118 | "Samsung Info. Systems America, Inc.", |
119 | "MP3 Player", | 119 | "MP3 Player", |
120 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 120 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
121 | US_FL_IGNORE_RESIDUE ), | 121 | US_FL_IGNORE_RESIDUE ), |
122 | 122 | ||
123 | /* Reported by Orgad Shaneh <orgads@gmail.com> */ | 123 | /* Reported by Orgad Shaneh <orgads@gmail.com> */ |
124 | UNUSUAL_DEV( 0x0419, 0xaace, 0x0100, 0x0100, | 124 | UNUSUAL_DEV( 0x0419, 0xaace, 0x0100, 0x0100, |
@@ -256,10 +256,10 @@ UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100, | |||
256 | * the revision to my model only | 256 | * the revision to my model only |
257 | */ | 257 | */ |
258 | UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, | 258 | UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, |
259 | "USB 2.0", | 259 | "USB 2.0", |
260 | "Flash Disk", | 260 | "Flash Disk", |
261 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 261 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
262 | US_FL_NOT_LOCKABLE ), | 262 | US_FL_NOT_LOCKABLE ), |
263 | 263 | ||
264 | #ifdef CONFIG_USB_STORAGE_KARMA | 264 | #ifdef CONFIG_USB_STORAGE_KARMA |
265 | UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, | 265 | UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, |
@@ -408,19 +408,19 @@ UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999, | |||
408 | /* Most of the following entries were developed with the help of | 408 | /* Most of the following entries were developed with the help of |
409 | * Shuttle/SCM directly. | 409 | * Shuttle/SCM directly. |
410 | */ | 410 | */ |
411 | UNUSUAL_DEV( 0x04e6, 0x0001, 0x0200, 0x0200, | 411 | UNUSUAL_DEV( 0x04e6, 0x0001, 0x0200, 0x0200, |
412 | "Matshita", | 412 | "Matshita", |
413 | "LS-120", | 413 | "LS-120", |
414 | US_SC_8020, US_PR_CB, NULL, 0), | 414 | US_SC_8020, US_PR_CB, NULL, 0), |
415 | 415 | ||
416 | UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100, | 416 | UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100, |
417 | "Shuttle", | 417 | "Shuttle", |
418 | "eUSCSI Bridge", | 418 | "eUSCSI Bridge", |
419 | US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, | 419 | US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, |
420 | US_FL_SCM_MULT_TARG ), | 420 | US_FL_SCM_MULT_TARG ), |
421 | 421 | ||
422 | #ifdef CONFIG_USB_STORAGE_SDDR09 | 422 | #ifdef CONFIG_USB_STORAGE_SDDR09 |
423 | UNUSUAL_DEV( 0x04e6, 0x0003, 0x0000, 0x9999, | 423 | UNUSUAL_DEV( 0x04e6, 0x0003, 0x0000, 0x9999, |
424 | "Sandisk", | 424 | "Sandisk", |
425 | "ImageMate SDDR09", | 425 | "ImageMate SDDR09", |
426 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, | 426 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, |
@@ -431,52 +431,52 @@ UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208, | |||
431 | "SCM Microsystems", | 431 | "SCM Microsystems", |
432 | "eUSB SmartMedia / CompactFlash Adapter", | 432 | "eUSB SmartMedia / CompactFlash Adapter", |
433 | US_SC_SCSI, US_PR_DPCM_USB, usb_stor_sddr09_dpcm_init, | 433 | US_SC_SCSI, US_PR_DPCM_USB, usb_stor_sddr09_dpcm_init, |
434 | 0), | 434 | 0), |
435 | #endif | 435 | #endif |
436 | 436 | ||
437 | /* Reported by Markus Demleitner <msdemlei@cl.uni-heidelberg.de> */ | 437 | /* Reported by Markus Demleitner <msdemlei@cl.uni-heidelberg.de> */ |
438 | UNUSUAL_DEV( 0x04e6, 0x0006, 0x0100, 0x0100, | 438 | UNUSUAL_DEV( 0x04e6, 0x0006, 0x0100, 0x0100, |
439 | "SCM Microsystems Inc.", | 439 | "SCM Microsystems Inc.", |
440 | "eUSB MMC Adapter", | 440 | "eUSB MMC Adapter", |
441 | US_SC_SCSI, US_PR_CB, NULL, | 441 | US_SC_SCSI, US_PR_CB, NULL, |
442 | US_FL_SINGLE_LUN), | 442 | US_FL_SINGLE_LUN), |
443 | 443 | ||
444 | /* Reported by Daniel Nouri <dpunktnpunkt@web.de> */ | 444 | /* Reported by Daniel Nouri <dpunktnpunkt@web.de> */ |
445 | UNUSUAL_DEV( 0x04e6, 0x0006, 0x0205, 0x0205, | 445 | UNUSUAL_DEV( 0x04e6, 0x0006, 0x0205, 0x0205, |
446 | "Shuttle", | 446 | "Shuttle", |
447 | "eUSB MMC Adapter", | 447 | "eUSB MMC Adapter", |
448 | US_SC_SCSI, US_PR_DEVICE, NULL, | 448 | US_SC_SCSI, US_PR_DEVICE, NULL, |
449 | US_FL_SINGLE_LUN), | 449 | US_FL_SINGLE_LUN), |
450 | 450 | ||
451 | UNUSUAL_DEV( 0x04e6, 0x0007, 0x0100, 0x0200, | 451 | UNUSUAL_DEV( 0x04e6, 0x0007, 0x0100, 0x0200, |
452 | "Sony", | 452 | "Sony", |
453 | "Hifd", | 453 | "Hifd", |
454 | US_SC_SCSI, US_PR_CB, NULL, | 454 | US_SC_SCSI, US_PR_CB, NULL, |
455 | US_FL_SINGLE_LUN), | 455 | US_FL_SINGLE_LUN), |
456 | 456 | ||
457 | UNUSUAL_DEV( 0x04e6, 0x0009, 0x0200, 0x0200, | 457 | UNUSUAL_DEV( 0x04e6, 0x0009, 0x0200, 0x0200, |
458 | "Shuttle", | 458 | "Shuttle", |
459 | "eUSB ATA/ATAPI Adapter", | 459 | "eUSB ATA/ATAPI Adapter", |
460 | US_SC_8020, US_PR_CB, NULL, 0), | 460 | US_SC_8020, US_PR_CB, NULL, 0), |
461 | 461 | ||
462 | UNUSUAL_DEV( 0x04e6, 0x000a, 0x0200, 0x0200, | 462 | UNUSUAL_DEV( 0x04e6, 0x000a, 0x0200, 0x0200, |
463 | "Shuttle", | 463 | "Shuttle", |
464 | "eUSB CompactFlash Adapter", | 464 | "eUSB CompactFlash Adapter", |
465 | US_SC_8020, US_PR_CB, NULL, 0), | 465 | US_SC_8020, US_PR_CB, NULL, 0), |
466 | 466 | ||
467 | UNUSUAL_DEV( 0x04e6, 0x000B, 0x0100, 0x0100, | 467 | UNUSUAL_DEV( 0x04e6, 0x000B, 0x0100, 0x0100, |
468 | "Shuttle", | 468 | "Shuttle", |
469 | "eUSCSI Bridge", | 469 | "eUSCSI Bridge", |
470 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, | 470 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, |
471 | US_FL_SCM_MULT_TARG ), | 471 | US_FL_SCM_MULT_TARG ), |
472 | 472 | ||
473 | UNUSUAL_DEV( 0x04e6, 0x000C, 0x0100, 0x0100, | 473 | UNUSUAL_DEV( 0x04e6, 0x000C, 0x0100, 0x0100, |
474 | "Shuttle", | 474 | "Shuttle", |
475 | "eUSCSI Bridge", | 475 | "eUSCSI Bridge", |
476 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, | 476 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, |
477 | US_FL_SCM_MULT_TARG ), | 477 | US_FL_SCM_MULT_TARG ), |
478 | 478 | ||
479 | UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200, | 479 | UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200, |
480 | "Shuttle", | 480 | "Shuttle", |
481 | "CD-RW Device", | 481 | "CD-RW Device", |
482 | US_SC_8020, US_PR_CB, NULL, 0), | 482 | US_SC_8020, US_PR_CB, NULL, 0), |
@@ -556,9 +556,9 @@ UNUSUAL_DEV( 0x052b, 0x1911, 0x0100, 0x0100, | |||
556 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 556 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
557 | US_FL_IGNORE_RESIDUE ), | 557 | US_FL_IGNORE_RESIDUE ), |
558 | 558 | ||
559 | UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450, | 559 | UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450, |
560 | "Sony", | 560 | "Sony", |
561 | "DSC-S30/S70/S75/505V/F505/F707/F717/P8", | 561 | "DSC-S30/S70/S75/505V/F505/F707/F717/P8", |
562 | US_SC_SCSI, US_PR_DEVICE, NULL, | 562 | US_SC_SCSI, US_PR_DEVICE, NULL, |
563 | US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT ), | 563 | US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT ), |
564 | 564 | ||
@@ -572,7 +572,7 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610, | |||
572 | 572 | ||
573 | 573 | ||
574 | /* Reported by wim@geeks.nl */ | 574 | /* Reported by wim@geeks.nl */ |
575 | UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100, | 575 | UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100, |
576 | "Sony", | 576 | "Sony", |
577 | "Memorystick NW-MS7", | 577 | "Memorystick NW-MS7", |
578 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 578 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
@@ -593,21 +593,21 @@ UNUSUAL_DEV( 0x054c, 0x002c, 0x0501, 0x2000, | |||
593 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 593 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
594 | US_FL_SINGLE_LUN ), | 594 | US_FL_SINGLE_LUN ), |
595 | 595 | ||
596 | UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100, | 596 | UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100, |
597 | "Sony", | 597 | "Sony", |
598 | "Memorystick MSAC-US1", | 598 | "Memorystick MSAC-US1", |
599 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 599 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
600 | US_FL_SINGLE_LUN ), | 600 | US_FL_SINGLE_LUN ), |
601 | 601 | ||
602 | /* Submitted by Klaus Mueller <k.mueller@intershop.de> */ | 602 | /* Submitted by Klaus Mueller <k.mueller@intershop.de> */ |
603 | UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310, | 603 | UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310, |
604 | "Sony", | 604 | "Sony", |
605 | "Handycam", | 605 | "Handycam", |
606 | US_SC_SCSI, US_PR_DEVICE, NULL, | 606 | US_SC_SCSI, US_PR_DEVICE, NULL, |
607 | US_FL_SINGLE_LUN ), | 607 | US_FL_SINGLE_LUN ), |
608 | 608 | ||
609 | /* Submitted by Rajesh Kumble Nayak <nayak@obs-nice.fr> */ | 609 | /* Submitted by Rajesh Kumble Nayak <nayak@obs-nice.fr> */ |
610 | UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500, | 610 | UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500, |
611 | "Sony", | 611 | "Sony", |
612 | "Handycam HC-85", | 612 | "Handycam HC-85", |
613 | US_SC_UFI, US_PR_DEVICE, NULL, | 613 | US_SC_UFI, US_PR_DEVICE, NULL, |
@@ -648,26 +648,26 @@ UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999, | |||
648 | 648 | ||
649 | /* Submitted by Frank Engel <frankie@cse.unsw.edu.au> */ | 649 | /* Submitted by Frank Engel <frankie@cse.unsw.edu.au> */ |
650 | UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999, | 650 | UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999, |
651 | "Sony", | 651 | "Sony", |
652 | "PEG Mass Storage", | 652 | "PEG Mass Storage", |
653 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 653 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
654 | US_FL_FIX_INQUIRY ), | 654 | US_FL_FIX_INQUIRY ), |
655 | 655 | ||
656 | /* floppy reports multiple luns */ | 656 | /* floppy reports multiple luns */ |
657 | UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210, | 657 | UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210, |
658 | "SAMSUNG", | 658 | "SAMSUNG", |
659 | "SFD-321U [FW 0C]", | 659 | "SFD-321U [FW 0C]", |
660 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 660 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
661 | US_FL_SINGLE_LUN ), | 661 | US_FL_SINGLE_LUN ), |
662 | 662 | ||
663 | 663 | ||
664 | UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299, | 664 | UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299, |
665 | "Y-E Data", | 665 | "Y-E Data", |
666 | "Flashbuster-U", | 666 | "Flashbuster-U", |
667 | US_SC_DEVICE, US_PR_CB, NULL, | 667 | US_SC_DEVICE, US_PR_CB, NULL, |
668 | US_FL_SINGLE_LUN), | 668 | US_FL_SINGLE_LUN), |
669 | 669 | ||
670 | UNUSUAL_DEV( 0x057b, 0x0000, 0x0300, 0x9999, | 670 | UNUSUAL_DEV( 0x057b, 0x0000, 0x0300, 0x9999, |
671 | "Y-E Data", | 671 | "Y-E Data", |
672 | "Flashbuster-U", | 672 | "Flashbuster-U", |
673 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 673 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
@@ -677,7 +677,7 @@ UNUSUAL_DEV( 0x057b, 0x0000, 0x0300, 0x9999, | |||
677 | * This entry is needed only because the device reports | 677 | * This entry is needed only because the device reports |
678 | * bInterfaceClass = 0xff (vendor-specific) | 678 | * bInterfaceClass = 0xff (vendor-specific) |
679 | */ | 679 | */ |
680 | UNUSUAL_DEV( 0x057b, 0x0022, 0x0000, 0x9999, | 680 | UNUSUAL_DEV( 0x057b, 0x0022, 0x0000, 0x9999, |
681 | "Y-E Data", | 681 | "Y-E Data", |
682 | "Silicon Media R/W", | 682 | "Silicon Media R/W", |
683 | US_SC_DEVICE, US_PR_DEVICE, NULL, 0), | 683 | US_SC_DEVICE, US_PR_DEVICE, NULL, 0), |
@@ -825,13 +825,13 @@ UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x9999, | |||
825 | US_SC_SCSI, US_PR_BULK, NULL, | 825 | US_SC_SCSI, US_PR_BULK, NULL, |
826 | US_FL_FIX_INQUIRY ), | 826 | US_FL_FIX_INQUIRY ), |
827 | 827 | ||
828 | UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100, | 828 | UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100, |
829 | "TEAC", | 829 | "TEAC", |
830 | "Floppy Drive", | 830 | "Floppy Drive", |
831 | US_SC_UFI, US_PR_CB, NULL, 0 ), | 831 | US_SC_UFI, US_PR_CB, NULL, 0 ), |
832 | 832 | ||
833 | #ifdef CONFIG_USB_STORAGE_SDDR09 | 833 | #ifdef CONFIG_USB_STORAGE_SDDR09 |
834 | UNUSUAL_DEV( 0x066b, 0x0105, 0x0100, 0x0100, | 834 | UNUSUAL_DEV( 0x066b, 0x0105, 0x0100, 0x0100, |
835 | "Olympus", | 835 | "Olympus", |
836 | "Camedia MAUSB-2", | 836 | "Camedia MAUSB-2", |
837 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, | 837 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, |
@@ -867,14 +867,14 @@ UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001, | |||
867 | 867 | ||
868 | /* Reported by Miguel A. Fosas <amn3s1a@ono.com> */ | 868 | /* Reported by Miguel A. Fosas <amn3s1a@ono.com> */ |
869 | UNUSUAL_DEV( 0x0686, 0x4017, 0x0001, 0x0001, | 869 | UNUSUAL_DEV( 0x0686, 0x4017, 0x0001, 0x0001, |
870 | "Minolta", | 870 | "Minolta", |
871 | "DIMAGE E223", | 871 | "DIMAGE E223", |
872 | US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), | 872 | US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), |
873 | 873 | ||
874 | UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, | 874 | UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, |
875 | "Hagiwara", | 875 | "Hagiwara", |
876 | "Flashgate", | 876 | "Flashgate", |
877 | US_SC_SCSI, US_PR_BULK, NULL, 0 ), | 877 | US_SC_SCSI, US_PR_BULK, NULL, 0 ), |
878 | 878 | ||
879 | /* Reported by David Hamilton <niftimusmaximus@lycos.com> */ | 879 | /* Reported by David Hamilton <niftimusmaximus@lycos.com> */ |
880 | UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, | 880 | UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, |
@@ -918,7 +918,7 @@ UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100, | |||
918 | US_FL_SINGLE_LUN ), | 918 | US_FL_SINGLE_LUN ), |
919 | 919 | ||
920 | #ifdef CONFIG_USB_STORAGE_SDDR09 | 920 | #ifdef CONFIG_USB_STORAGE_SDDR09 |
921 | UNUSUAL_DEV( 0x0781, 0x0200, 0x0000, 0x9999, | 921 | UNUSUAL_DEV( 0x0781, 0x0200, 0x0000, 0x9999, |
922 | "Sandisk", | 922 | "Sandisk", |
923 | "ImageMate SDDR-09", | 923 | "ImageMate SDDR-09", |
924 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, | 924 | US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, |
@@ -939,17 +939,17 @@ UNUSUAL_DEV( 0x07ab, 0xfccd, 0x0000, 0x9999, | |||
939 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 939 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
940 | US_FL_FIX_CAPACITY), | 940 | US_FL_FIX_CAPACITY), |
941 | 941 | ||
942 | UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133, | 942 | UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133, |
943 | "Microtech", | 943 | "Microtech", |
944 | "USB-SCSI-DB25", | 944 | "USB-SCSI-DB25", |
945 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, | 945 | US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, |
946 | US_FL_SCM_MULT_TARG ), | 946 | US_FL_SCM_MULT_TARG ), |
947 | 947 | ||
948 | UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100, | 948 | UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100, |
949 | "Microtech", | 949 | "Microtech", |
950 | "USB-SCSI-HD50", | 950 | "USB-SCSI-HD50", |
951 | US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, | 951 | US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, |
952 | US_FL_SCM_MULT_TARG ), | 952 | US_FL_SCM_MULT_TARG ), |
953 | 953 | ||
954 | #ifdef CONFIG_USB_STORAGE_DPCM | 954 | #ifdef CONFIG_USB_STORAGE_DPCM |
955 | UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, | 955 | UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, |
@@ -1053,10 +1053,10 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff, | |||
1053 | * as "DualSlot CompactFlash(TM) & MStick Drive USB" | 1053 | * as "DualSlot CompactFlash(TM) & MStick Drive USB" |
1054 | */ | 1054 | */ |
1055 | UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0xffff, | 1055 | UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0xffff, |
1056 | "DataFab Systems Inc.", | 1056 | "DataFab Systems Inc.", |
1057 | "USB CF+MS", | 1057 | "USB CF+MS", |
1058 | US_SC_SCSI, US_PR_DATAFAB, NULL, | 1058 | US_SC_SCSI, US_PR_DATAFAB, NULL, |
1059 | 0 ), | 1059 | 0 ), |
1060 | 1060 | ||
1061 | #endif | 1061 | #endif |
1062 | 1062 | ||
@@ -1119,10 +1119,10 @@ UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000, | |||
1119 | * US_FL_IGNORE_RESIDUE Needed | 1119 | * US_FL_IGNORE_RESIDUE Needed |
1120 | */ | 1120 | */ |
1121 | UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100, | 1121 | UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100, |
1122 | "AIPTEK", | 1122 | "AIPTEK", |
1123 | "Aiptek USB Keychain MP3 Player", | 1123 | "Aiptek USB Keychain MP3 Player", |
1124 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1124 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1125 | US_FL_IGNORE_RESIDUE), | 1125 | US_FL_IGNORE_RESIDUE), |
1126 | 1126 | ||
1127 | /* Entry needed for flags. Moreover, all devices with this ID use | 1127 | /* Entry needed for flags. Moreover, all devices with this ID use |
1128 | * bulk-only transport, but _some_ falsely report Control/Bulk instead. | 1128 | * bulk-only transport, but _some_ falsely report Control/Bulk instead. |
@@ -1166,26 +1166,26 @@ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, | |||
1166 | * Submitted by James Courtier-Dutton <James@superbug.demon.co.uk> | 1166 | * Submitted by James Courtier-Dutton <James@superbug.demon.co.uk> |
1167 | */ | 1167 | */ |
1168 | UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000, | 1168 | UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000, |
1169 | "Pentax", | 1169 | "Pentax", |
1170 | "Optio 2/3/400", | 1170 | "Optio 2/3/400", |
1171 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1171 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1172 | US_FL_FIX_INQUIRY ), | 1172 | US_FL_FIX_INQUIRY ), |
1173 | 1173 | ||
1174 | 1174 | ||
1175 | /* Submitted by Per Winkvist <per.winkvist@uk.com> */ | 1175 | /* Submitted by Per Winkvist <per.winkvist@uk.com> */ |
1176 | UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, | 1176 | UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, |
1177 | "Pentax", | 1177 | "Pentax", |
1178 | "Optio S/S4", | 1178 | "Optio S/S4", |
1179 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1179 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1180 | US_FL_FIX_INQUIRY ), | 1180 | US_FL_FIX_INQUIRY ), |
1181 | 1181 | ||
1182 | /* These are virtual windows driver CDs, which the zd1211rw driver | 1182 | /* These are virtual windows driver CDs, which the zd1211rw driver |
1183 | * automatically converts into WLAN devices. */ | 1183 | * automatically converts into WLAN devices. */ |
1184 | UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, | 1184 | UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, |
1185 | "ZyXEL", | 1185 | "ZyXEL", |
1186 | "G-220F USB-WLAN Install", | 1186 | "G-220F USB-WLAN Install", |
1187 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1187 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1188 | US_FL_IGNORE_DEVICE ), | 1188 | US_FL_IGNORE_DEVICE ), |
1189 | 1189 | ||
1190 | UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101, | 1190 | UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101, |
1191 | "SiteCom", | 1191 | "SiteCom", |
@@ -1211,17 +1211,17 @@ UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, | |||
1211 | 1211 | ||
1212 | #ifdef CONFIG_USB_STORAGE_DATAFAB | 1212 | #ifdef CONFIG_USB_STORAGE_DATAFAB |
1213 | UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, | 1213 | UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, |
1214 | "Acomdata", | 1214 | "Acomdata", |
1215 | "CF", | 1215 | "CF", |
1216 | US_SC_SCSI, US_PR_DATAFAB, NULL, | 1216 | US_SC_SCSI, US_PR_DATAFAB, NULL, |
1217 | US_FL_SINGLE_LUN ), | 1217 | US_FL_SINGLE_LUN ), |
1218 | #endif | 1218 | #endif |
1219 | #ifdef CONFIG_USB_STORAGE_SDDR55 | 1219 | #ifdef CONFIG_USB_STORAGE_SDDR55 |
1220 | UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, | 1220 | UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, |
1221 | "Acomdata", | 1221 | "Acomdata", |
1222 | "SM", | 1222 | "SM", |
1223 | US_SC_SCSI, US_PR_SDDR55, NULL, | 1223 | US_SC_SCSI, US_PR_SDDR55, NULL, |
1224 | US_FL_SINGLE_LUN ), | 1224 | US_FL_SINGLE_LUN ), |
1225 | #endif | 1225 | #endif |
1226 | 1226 | ||
1227 | /* Submitted by: Nick Sillik <n.sillik@temple.edu> | 1227 | /* Submitted by: Nick Sillik <n.sillik@temple.edu> |