aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorLukas Ertl <le@FreeBSD.org>2007-02-04 22:14:18 +0000
committerLukas Ertl <le@FreeBSD.org>2007-02-04 22:14:18 +0000
commit92fb2d84f5f829bb3deeb6c5d5635c551e9a93b4 (patch)
treebbe7d57fb8e9ccbf052884d57cc5a3a2d06b3b7d /sys
parent3181f5556f228a697dabec04eff661b179f7c2d5 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/ubsa.c2
-rw-r--r--sys/dev/usb/usbdevs4
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index b29b306e34701..f382c1d7ed9ae 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -224,6 +224,8 @@ static const struct ubsa_product {
{ USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 },
/* Peracom */
{ USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 },
+ /* Novatel Wireless Merlin cards */
+ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 },
/* Option Vodafone MC3G */
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G },
/* Option GlobeTrotter 3G */
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 8aa339f8007c9..7d463c8867b95 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -517,6 +517,7 @@ vendor AINCOMM 0x12fd Aincomm
vendor MOBILITY 0x1342 Mobility
vendor LINKSYS4 0x13b1 Linksys
vendor SHARK 0x13d2 Shark
+vendor NOVATEL 0x1410 Novatel Wireless
vendor RADIOSHACK 0x1453 Radio Shack
vendor SILICOM 0x1485 Silicom
vendor RALINK 0x148f Ralink Technology
@@ -1403,6 +1404,9 @@ product NIKON LS40 0x4000 CoolScan LS40 ED
/* NovaTech Products */
product NOVATECH NV902 0x9020 NovaTech NV-902W
+/* Novatel Wireless products */
+product NOVATEL U740 0x1400 Merlin U740
+
/* Olympus products */
product OLYMPUS C1 0x0102 C-1 Digital Camera
product OLYMPUS C700 0x0105 C-700 Ultra Zoom