svn commit: r183978 - in stable/6/sys: . dev/usb

[Ollivier Robert]

Author: roberto
Date: Fri Oct 17 15:06:34 2008
New Revision: 183978
URL: http://svn.freebsd.org/changeset/base/183978

Log:
  Merge r179057 into stable/6, sorry it won't be in 6.4.
  Add device ID for Nikon D300 digital camera.
  
  PR:		usb/118741
  Submitted by:	Yuri <yuri at tsoft.com>
  Approved by:	re (rwatson)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/dev/usb/umass.c
  stable/6/sys/dev/usb/usbdevs

Modified: stable/6/sys/dev/usb/umass.c
==============================================================================
--- stable/6/sys/dev/usb/umass.c	Fri Oct 17 14:40:03 2008	(r183977)
+++ stable/6/sys/dev/usb/umass.c	Fri Oct 17 15:06:34 2008	(r183978)
@@ -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: stable/6/sys/dev/usb/usbdevs
==============================================================================
--- stable/6/sys/dev/usb/usbdevs	Fri Oct 17 14:40:03 2008	(r183977)
+++ stable/6/sys/dev/usb/usbdevs	Fri Oct 17 15:06:34 2008	(r183978)
@@ -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