From owner-svn-src-stable-6@FreeBSD.ORG Fri Oct 17 15:06:34 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 809081065701; Fri, 17 Oct 2008 15:06:34 +0000 (UTC) (envelope-from roberto@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A79E8FC16; Fri, 17 Oct 2008 15:06:34 +0000 (UTC) (envelope-from roberto@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 m9HF6YBo091225; Fri, 17 Oct 2008 15:06:34 GMT (envelope-from roberto@svn.freebsd.org) Received: (from roberto@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HF6Ybr091223; Fri, 17 Oct 2008 15:06:34 GMT (envelope-from roberto@svn.freebsd.org) Message-Id: <200810171506.m9HF6Ybr091223@svn.freebsd.org> From: Ollivier Robert Date: Fri, 17 Oct 2008 15:06:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183978 - in stable/6/sys: . dev/usb X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2008 15:06:34 -0000 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 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