Merge kroah.com:/home/linux/BK/bleed-2.5

into kroah.com:/home/linux/BK/gregkh-2.6

Merge kroah.com:/home/linux/BK/bleed-2.5
into kroah.com:/home/linux/BK/gregkh-2.6
1d4a9dcc · Greg Kroah-Hartman · d017c467 · 562eb1ed · 1d4a9dcc
Commit 1d4a9dcc authored Sep 30, 2003 by Greg Kroah-Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

drivers/usb/storage/unusual_devs.h drivers/usb/storage/unusual_devs.h +6 -0

No files found.
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -394,6 +394,12 @@ UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001,
 		"Dimage F300",
 		US_SC_SCSI, US_PR_BULK, NULL, 0 ),

+/* Reported by Miguel A. Fosas <amn3s1a@ono.com> */
+UNUSUAL_DEV(  0x0686, 0x4017, 0x0001, 0x0001,
+                "Minolta",
+                "DIMAGE E223",
+                US_SC_SCSI, US_PR_DEVICE, NULL, 0 ),
+
 UNUSUAL_DEV(  0x0693, 0x0002, 0x0100, 0x0100, 
 		"Hagiwara",
 		"FlashGate SmartMedia",