From 9b7943987e885d50f0e4065be77317575027fb3c Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 5 Oct 2007 14:43:00 -0400
Subject: [PATCH] --- yaml --- r: 67917 b: refs/heads/master c:
 3046c6db575019ba4ce6b9deac352d438ddf733d h: refs/heads/master i:   67915:
 9596f4ee6e6a59897160bf22339c8110bd12dd9b v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/usb/storage/unusual_devs.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cba81a945ed9..b394e4c6226c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27f5d75afaa1b65e4cc1e4ac8a2a5095d24f1576
+refs/heads/master: 3046c6db575019ba4ce6b9deac352d438ddf733d
diff --git a/trunk/drivers/usb/storage/unusual_devs.h b/trunk/drivers/usb/storage/unusual_devs.h
index 5129b538be90..edf92914674a 100644
--- a/trunk/drivers/usb/storage/unusual_devs.h
+++ b/trunk/drivers/usb/storage/unusual_devs.h
@@ -362,6 +362,13 @@ UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_FIX_CAPACITY),
 
+/* Reported by Paul Check <paul@openstreet.com> */
+UNUSUAL_DEV(  0x04b0, 0x0415, 0x0100, 0x0100,
+		"NIKON",
+		"NIKON DSC D2Xs",
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_FIX_CAPACITY),
+
 /* BENQ DC5330
  * Reported by Manuel Fombuena <mfombuena@ya.com> and
  * Frank Copeland <fjc@thingy.apana.org.au> */