diff options
| author | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2004-09-20 05:03:28 +0000 |
|---|---|---|
| committer | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2004-09-20 05:03:28 +0000 |
| commit | 094b7dea2ebb8620e9dde4587c2550446d6239ee (patch) | |
| tree | a73e7b4417890e79c0eccbecf07fada4e03cfa01 /sys/dev | |
| parent | fdc7477127200b0e22481ed26d1d06b59956836e (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usbdevs | 1 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 952e21b4891d..8e1fc8254898 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1038,6 +1038,7 @@ product NETGEAR FA120 0x1040 USB 2.0 Ethernet adapter /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 +product NIKON LS40 0x4000 CoolScan LS40 ED /* Olympus products */ product OLYMPUS C1 0x0102 C-1 Digital Camera diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index fad3dc1c6eb3..eed75e4cddea 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -170,6 +170,9 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200 }, 0 }, {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400 }, 0 }, + /* Nikon */ + {{ USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40 }, 0 }, + /* Primax */ {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300 }, 0 }, {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300 }, 0 }, |