This patch re-sorts unusual_devs.h and removes some duplicate entries. Greg, please apply.
Matt
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.716 -> 1.717
# drivers/usb/storage/unusual_devs.h 1.53 -> 1.54
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/28 [EMAIL PROTECTED] 1.717
# Re-sort unusual_devs.h, remove duplicate entries.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/unusual_devs.h Sat Jun 28 20:33:11 2003
+++ b/drivers/usb/storage/unusual_devs.h Sat Jun 28 20:33:11 2003
@@ -252,6 +252,14 @@
US_SC_UFI, US_PR_CB, NULL,
US_FL_SINGLE_LUN ),
+#ifdef CONFIG_USB_STORAGE_ISD200
+UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110,
+ "Sony",
+ "Portable USB Harddrive V2",
+ US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+ 0 ),
+#endif
+
UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100,
"Sony",
"Memorystick MSAC-US1",
@@ -295,26 +303,6 @@
"USB Hard Disk",
US_SC_RBC, US_PR_CB, NULL, 0 ),
-/* 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_DEVICE, US_PR_DEVICE, 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 ),
-
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110,
"In-System",
@@ -339,12 +327,6 @@
"USB Storage Adapter V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
0 ),
-
-UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110,
- "Sony",
- "Portable USB Harddrive V2",
- US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
#endif
#ifdef CONFIG_USB_STORAGE_JUMPSHOT
@@ -385,12 +367,6 @@
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ),
-UNUSUAL_DEV( 0x05e3, 0x0700, 0x0000, 0x9999,
- "Unknown",
- "GL641USB based CF Card reader",
- US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY | US_FL_MODE_XLATE),
-
/* Reported by Hanno Boeck <[EMAIL PROTECTED]>
* Taken from the Lycoris Kernel */
UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x9999,
@@ -520,13 +496,6 @@
"Simple Tech/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
US_FL_MODE_XLATE ),
-
-/* Submitted by Olaf Hering <[EMAIL PROTECTED]> */
-UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
- "Datafab Systems, Inc.",
- "USB to CF + SM Combo (LC1)",
- US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
@@ -538,6 +507,15 @@
US_FL_FIX_INQUIRY ),
#endif
+#ifdef CONFIG_USB_STORAGE_DATAFAB
+/* Submitted by Olaf Hering <[EMAIL PROTECTED]> */
+UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
+ "Datafab Systems, Inc.",
+ "USB to CF + SM Combo (LC1)",
+ US_SC_SCSI, US_PR_DATAFAB, NULL,
+ US_FL_MODE_XLATE ),
+#endif
+
/* Datafab KECF-USB / Sagatek DCS-CF / Simpletech Flashlink UCF-100
* Only revision 1.13 tested (same for all of the above devices,
* based on the Datafab DF-UG-07 chip). Needed for US_FL_FIX_INQUIRY.
@@ -563,19 +541,28 @@
US_SC_8070, US_PR_CB, NULL,
US_FL_FIX_INQUIRY ),
+/* Submitted by Hartmut Wahl <[EMAIL PROTECTED]>*/
+UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
+ "Samsung",
+ "Digimax 410",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_INQUIRY),
+
+/* Aiptek PocketCAM 3Mega
+ * Nicolas DUPEUX <[EMAIL PROTECTED]>
+ */
+UNUSUAL_DEV( 0x08ca, 0x2011, 0x0000, 0x9999,
+ "AIPTEK",
+ "PocketCAM 3Mega",
+ US_SC_SCSI, US_PR_BULK, NULL,
+ US_FL_MODE_XLATE ),
+
/* aeb */
UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
"Feiya",
"5-in-1 Card Reader",
US_SC_SCSI, US_PR_BULK, NULL,
US_FL_FIX_CAPACITY ),
-
-/* Submitted by Hartmut Wahl <[EMAIL PROTECTED]>*/
-UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
- "Samsung",
- "Digimax 410",
- US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY),
UNUSUAL_DEV( 0x097a, 0x0001, 0x0000, 0x0001,
"[EMAIL PROTECTED]",
@@ -589,11 +576,25 @@
US_SC_SCSI, US_PR_BULK, NULL,
US_FL_FIX_INQUIRY ),
-UNUSUAL_DEV( 0x0a16, 0x8888, 0x0100, 0x0100,
- "IBM",
- "IBM USB Memory Key",
- US_SC_SCSI, US_PR_BULK, 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,
+ "Pentax",
+ "Optio 2/3/400",
+ US_SC_DEVICE, US_PR_DEVICE, 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 ),
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
@@ -603,13 +604,6 @@
0 ),
#endif
-/* EasyDisk support. Submitted by Stanislav Karchebny <[EMAIL PROTECTED]> */
-UNUSUAL_DEV( 0x1065, 0x2136, 0x0000, 0x0001,
- "Global Channel Solutions",
- "EasyDisk EDxxxx",
- US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_MODE_XLATE | US_FL_FIX_INQUIRY ),
-
/* Reported by Kevin Cernekee <[EMAIL PROTECTED]>
* Tested on hardware version 1.10.
* Entry is needed only for the initializer function override.
@@ -638,13 +632,3 @@
US_SC_SCSI, US_PR_SDDR55, NULL,
US_FL_SINGLE_LUN),
#endif
-
-/* Aiptek PocketCAM 3Mega
- * Nicolas DUPEUX <[EMAIL PROTECTED]>
- */
-UNUSUAL_DEV( 0x08ca, 0x2011, 0x0000, 0x9999,
- "AIPTEK",
- "PocketCAM 3Mega",
- US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_MODE_XLATE ),
-
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
Somebody call an exorcist!
-- Dust Puppy
User Friendly, 5/16/1998
pgp00000.pgp
Description: PGP signature
