summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-07-16 15:30:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-19 17:46:05 -0700
commitd8fbba2f59c0c131a1babf5a66f003faee02e01a (patch)
tree4b49ddb73b4c1ba6f21ec9ce21901817cf62963d
parent0d46c0079a8eeed25105fa374f79862842ee80c1 (diff)
downloadkernel-crypto-d8fbba2f59c0c131a1babf5a66f003faee02e01a.tar.gz
kernel-crypto-d8fbba2f59c0c131a1babf5a66f003faee02e01a.tar.xz
kernel-crypto-d8fbba2f59c0c131a1babf5a66f003faee02e01a.zip
USB: usb-storage: unusual_devs entry for Nikon D100
This patch (as938) adds an unusual_devs entry for the Nikon DSC D100. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Cc: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/storage/unusual_devs.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 26fd196869b..a624e72f81d 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -313,6 +313,13 @@ UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x0010,
US_SC_DEVICE, US_PR_DEVICE,NULL,
US_FL_NOT_LOCKABLE ),
+/* Reported by Stefan de Konink <skinkie@xs4all.nl> */
+UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x0200,
+ "NIKON",
+ "NIKON DSC D100",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY),
+
/* Reported by Andreas Bockhold <andreas@bockionline.de> */
UNUSUAL_DEV( 0x04b0, 0x0405, 0x0100, 0x0100,
"NIKON",