diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-12 10:34:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-12 10:34:58 -0700 |
| commit | 49f2e1cedfcf1dac72efe6e3634a3cd2db299e30 (patch) | |
| tree | 2a14952ee819997219b2e6affba2eb5708c327be /adb | |
| parent | 57fd0989cbb59f305514378e511e36c752b5aa20 (diff) | |
| parent | cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9 (diff) | |
| download | system_core-49f2e1cedfcf1dac72efe6e3634a3cd2db299e30.zip system_core-49f2e1cedfcf1dac72efe6e3634a3cd2db299e30.tar.gz system_core-49f2e1cedfcf1dac72efe6e3634a3cd2db299e30.tar.bz2 | |
am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
* commit 'cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9':
Add USB Vendor ID for MSI
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/usb_vendors.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index 68bb232..93dda5d 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -155,6 +155,8 @@ #define VENDOR_ID_QISDA 0x1D45 // ECS's USB Vendor ID #define VENDOR_ID_ECS 0x03fc +// MSI's USB Vendor ID +#define VENDOR_ID_MSI 0x1462 /** built-in vendor list */ @@ -219,6 +221,7 @@ int builtInVendorIds[] = { VENDOR_ID_NOOK, VENDOR_ID_QISDA, VENDOR_ID_ECS, + VENDOR_ID_MSI, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |