diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-21 18:09:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 18:09:16 +0000 |
| commit | aa98c835462177597eba90eac297a1a86f4a02d0 (patch) | |
| tree | 0b9fc661323e6a6eebc22a10967268a9a7b9a91a /adb | |
| parent | dd6b662c4f20f89876cee7a52e4b6d9e33d2bfca (diff) | |
| parent | 01d49e854fa09a776c9673b229efcfa2d53adfea (diff) | |
| download | system_core-aa98c835462177597eba90eac297a1a86f4a02d0.zip system_core-aa98c835462177597eba90eac297a1a86f4a02d0.tar.gz system_core-aa98c835462177597eba90eac297a1a86f4a02d0.tar.bz2 | |
am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."
* commit '01d49e854fa09a776c9673b229efcfa2d53adfea':
adb: Add USB vendor ID for Ubiquiti Networks, Inc.
Diffstat (limited to 'adb')
| -rwxr-xr-x | 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 aabf4f2..e998437 100755 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -189,6 +189,8 @@ #define VENDOR_ID_TOSHIBA 0x0930 // TrekStor's USB Vendor ID #define VENDOR_ID_TREKSTOR 0x1E68 +// Ubiquiti Networks's USB Vendor ID +#define VENDOR_ID_UBNT 0x1f9b // Unowhy's USB Vendor ID #define VENDOR_ID_UNOWHY 0x2A49 // Vizio's USB Vendor ID @@ -283,6 +285,7 @@ int builtInVendorIds[] = { VENDOR_ID_TI, VENDOR_ID_TOSHIBA, VENDOR_ID_TREKSTOR, + VENDOR_ID_UBNT, VENDOR_ID_UNOWHY, VENDOR_ID_VIZIO, VENDOR_ID_WACOM, |