diff options
| -rw-r--r-- | sys/dev/usb/umass.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 4f615b455053..cbd8288766b1 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -424,6 +424,10 @@ Static struct umass_devdescr_t umass_devdescrs[] = { 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 diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 0986c9a3d40a..63af1863871f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1356,6 +1356,7 @@ product NETGEAR FA120 0x1040 USB 2.0 Ethernet /* 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 |