From owner-svn-src-all@FreeBSD.ORG  Sun Oct 26 17:03:51 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB0A61065671;
	Sun, 26 Oct 2008 17:03:51 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 992538FC0A;
	Sun, 26 Oct 2008 17:03:51 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QH3pAx088239;
	Sun, 26 Oct 2008 17:03:51 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QH3p1D088237;
	Sun, 26 Oct 2008 17:03:51 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <200810261703.m9QH3p1D088237@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Sun, 26 Oct 2008 17:03:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184291 - in releng/6.4/sys: . dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Oct 2008 17:03:51 -0000

Author: kensmith
Date: Sun Oct 26 17:03:51 2008
New Revision: 184291
URL: http://svn.freebsd.org/changeset/base/184291

Log:
  MFS r183978:
  Go ahead with adding device ID for Nikon D300 camera so it gets into
  6.4-REL.
  
  PR:		usb/118741
  Submitted by:	Yuri <yuri at tsoft dot com>
  Approved by:	re (rwatson for stable/6, kib for me doing releng/6.4)

Modified:
  releng/6.4/sys/   (props changed)
  releng/6.4/sys/dev/usb/umass.c
  releng/6.4/sys/dev/usb/usbdevs

Modified: releng/6.4/sys/dev/usb/umass.c
==============================================================================
--- releng/6.4/sys/dev/usb/umass.c	Sun Oct 26 15:41:23 2008	(r184290)
+++ releng/6.4/sys/dev/usb/umass.c	Sun Oct 26 17:03:51 2008	(r184291)
@@ -424,6 +424,10 @@ Static struct umass_devdescr_t umass_dev
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  FORCE_SHORT_INQUIRY
 	},
+	{ USB_VENDOR_NIKON, USB_PRODUCT_NIKON_D300, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  NO_QUIRKS
+	},
 	{ USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  WRONG_CSWSIG

Modified: releng/6.4/sys/dev/usb/usbdevs
==============================================================================
--- releng/6.4/sys/dev/usb/usbdevs	Sun Oct 26 15:41:23 2008	(r184290)
+++ releng/6.4/sys/dev/usb/usbdevs	Sun Oct 26 17:03:51 2008	(r184291)
@@ -1356,6 +1356,7 @@ product NETGEAR FA120		0x1040	USB 2.0 Et
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON LS40		0x4000	CoolScan LS40 ED
+product NIKON D300		0x041a  Digital Camera D300
 
 /* NovaTech Products */
 product NOVATECH NV902		0x9020  NovaTech NV-902W