diff options
| author | dim <dim@FreeBSD.org> | 2010-11-16 10:33:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-16 10:33:41 +0000 |
| commit | b0df1c137c1d7cc6c086e8c3de63b91a97e180c7 (patch) | |
| tree | 56f0dadc92981a1efbf66b53a434baa21a8c2c82 /sys/dev/usb | |
| parent | b355314642d1e24edf4e05d08b793f8b9ea76458 (diff) | |
| download | FreeBSD-src-b0df1c137c1d7cc6c086e8c3de63b91a97e180c7.zip FreeBSD-src-b0df1c137c1d7cc6c086e8c3de63b91a97e180c7.tar.gz | |
Sync: merge r215319 through r215395 from ^/head, so ports can actually
build! :)
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/net/if_ruereg.h | 5 | ||||
| -rw-r--r-- | sys/dev/usb/serial/u3g.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/net/if_ruereg.h b/sys/dev/usb/net/if_ruereg.h index a4a4aec..c90a969 100644 --- a/sys/dev/usb/net/if_ruereg.h +++ b/sys/dev/usb/net/if_ruereg.h @@ -157,11 +157,6 @@ struct rue_intrpkt { uint8_t rue_col_cnt; } __packed; -struct rue_type { - uint16_t rue_vid; - uint16_t rue_did; -}; - enum { RUE_BULK_DT_WR, RUE_BULK_DT_RD, diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 0777cdd..646063a 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -288,6 +288,7 @@ static const struct usb_device_id u3g_devs[] = { U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI), @@ -457,6 +458,7 @@ static const struct usb_device_id u3g_devs[] = { U3G_DEV(SIERRA, MC5727, 0), U3G_DEV(SIERRA, MC5727_2, 0), U3G_DEV(SIERRA, MC5728, 0), + U3G_DEV(SIERRA, MC8700, 0), U3G_DEV(SIERRA, MC8755, 0), U3G_DEV(SIERRA, MC8755_2, 0), U3G_DEV(SIERRA, MC8755_3, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 87350a7..91fe9f4 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1857,6 +1857,7 @@ product HUAWEI E143F 0x143f 3G modem product HUAWEI E1752 0x1446 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E14AC 0x14ac 3G modem +product HUAWEI K3765_INIT 0x1520 HUAWEI Mobile K3765 Initial /* HUAWEI 3com products */ product HUAWEI3COM WUB320G 0x0009 Aolynk WUB320g @@ -2919,6 +2920,7 @@ product SIERRA C888 0x6890 C888 product SIERRA C22 0x6891 C22 product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 +product SIERRA MC8700 0x68A3 MC8700 product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer |
