ChangeSet 1.1254.1.2, 2003/05/29 15:03:07-07:00, [EMAIL PROTECTED]
USB: fix up unusual_devs.h merge mess
Thanks to Per Winkvist for the info and patches to do this.
drivers/usb/storage/unusual_devs.h | 47 ++++---------------------------------
1 files changed, 6 insertions(+), 41 deletions(-)
diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/unusual_devs.h Fri May 30 11:35:43 2003
+++ b/drivers/usb/storage/unusual_devs.h Fri May 30 11:35:43 2003
@@ -314,33 +314,18 @@
* Submitted by James Courtier-Dutton <[EMAIL PROTECTED]>
*/
UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
- "ASAHI PENTAX",
- "PENTAX OPTIO 430",
+ "Pentax",
+ "Optio 2/3/400",
US_SC_8070, US_PR_CBI, NULL,
US_FL_FIX_INQUIRY ),
-/* This Pentax still camera is not conformant
- * to the USB storage specification: -
- * - It does not like the INQUIRY command. So we must handle this command
- * of the SCSI layer ourselves.
- * Tested on Rev. 10.00 (0x1000)
- * Submitted by James Courtier-Dutton <[EMAIL PROTECTED]>
- */
-UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
- "ASAHI PENTAX",
- "PENTAX OPTIO 430",
+/* Submitted by Per Winkvist <[EMAIL PROTECTED]> */
+UNUSUAL_DEV( 0x0a17, 0x006, 0x1000, 0x9009,
+ "Pentax",
+ "Optio S",
US_SC_8070, US_PR_CBI, NULL,
US_FL_FIX_INQUIRY ),
-/* Pentax Optio S digital camera
- * submitted by Stefan M. Brandl <[EMAIL PROTECTED]>
- */
-UNUSUAL_DEV( 0x0a17, 0x0006, 0x0000, 0xffff,
- "Pentax",
- "Optio S",
- US_SC_8070, US_PR_CB, NULL,
- US_FL_MODE_XLATE|US_FL_FIX_INQUIRY),
-
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110,
"In-System",
@@ -638,26 +623,6 @@
"EasyDisk EDxxxx",
US_SC_SCSI, US_PR_BULK, NULL,
US_FL_MODE_XLATE | US_FL_START_STOP | US_FL_FIX_INQUIRY ),
-
-/* This Pentax still camera is not conformant
- * to the USB storage specification: -
- * - It does not like the INQUIRY command. So we must handle this command
- * of the SCSI layer ourselves.
- * Tested on Rev. 10.00 (0x1000)
- * Submitted by James Courtier-Dutton <[EMAIL PROTECTED]>
- */
-UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
- "Pentax",
- "Optio 2/3/400",
- US_SC_8070, US_PR_CBI, NULL,
- US_FL_FIX_INQUIRY ),
-
-/* Submitted by Per Winkvist <[EMAIL PROTECTED]> */
-UNUSUAL_DEV( 0x0a17, 0x006, 0x1000, 0x9009,
- "Pentax",
- "Optio S",
- US_SC_8070, US_PR_CBI, NULL,
- US_FL_FIX_INQUIRY ),
/* Submitted by Brian Hall <[EMAIL PROTECTED]>
* Needed for START_STOP flag */
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
