am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc': Emerson USB ID
2014-01-12 07:20:13 +00:00 · 2014-01-12 07:20:13 +00:00 · ccfa8988bb
parent 6e9c19906a 6f8ddbbbe8
commit ccfa8988bb
1 changed files with 3 additions and 0 deletions
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@ -58,6 +58,8 @@
 #define VENDOR_ID_ECS           0x03fc
 // EMERGING_TECH's USB Vendor ID
 #define VENDOR_ID_EMERGING_TECH 0x297F
+// Emerson's USB Vendor ID
+#define VENDOR_ID_EMERSON       0x2207
 // Foxconn's USB Vendor ID
 #define VENDOR_ID_FOXCONN       0x0489
 // Fujitsu's USB Vendor ID
@ -192,6 +194,7 @@ int builtInVendorIds[] = {
    VENDOR_ID_DELL,
    VENDOR_ID_ECS,
    VENDOR_ID_EMERGING_TECH,
+    VENDOR_ID_EMERSON,
    VENDOR_ID_FOXCONN,
    VENDOR_ID_FUJITSU,
    VENDOR_ID_FUNAI,