svn commit: r184291 - in releng/6.4/sys: . dev/usb

[Ken Smith]

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