MFC r199332

Sort ID list by vendor.
This commit is contained in:
Andrew Thompson 2009-12-31 00:03:29 +00:00
parent 0208cd85e5
commit 1749b20333

View file

@ -173,6 +173,10 @@ MODULE_DEPEND(u3g, usb, 1, 1, 1);
static const struct usb_device_id u3g_devs[] = {
#define U3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
/* OEM: Huawei */
U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
/* OEM: Option */
U3G_DEV(OPTION, GT3G, 0),
U3G_DEV(OPTION, GT3GQUAD, 0),
@ -186,10 +190,8 @@ static const struct usb_device_id u3g_devs[] = {
/* OEM: Qualcomm, Inc. */
U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
/* OEM: Huawei */
U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
/* OEM: Merlin */
U3G_DEV(MERLIN, V620, 0),
/* OEM: Novatel */
U3G_DEV(NOVATEL, CDMA_MODEM, 0),
U3G_DEV(NOVATEL, ES620, 0),
@ -208,8 +210,6 @@ static const struct usb_device_id u3g_devs[] = {
U3G_DEV(NOVATEL, ZEROCD, U3GFL_SCSI_EJECT),
U3G_DEV(NOVATEL, U760, U3GFL_SCSI_EJECT),
U3G_DEV(DELL, U740, 0),
/* OEM: Merlin */
U3G_DEV(MERLIN, V620, 0),
/* OEM: Sierra Wireless: */
U3G_DEV(SIERRA, AIRCARD580, 0),
U3G_DEV(SIERRA, AIRCARD595, 0),