diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-24 08:42:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-24 08:42:49 -0800 |
commit | 70580b20bc8485002df0b3e89e42754c8c9796ff (patch) | |
tree | f5e6e751fa538c0d9852cb665bdc76b6ad6a0eac /adb/usb_vendors.c | |
parent | 546dc10c1a7c6fb348507899d3629af01b4e4c43 (diff) | |
parent | 149ae11fb63818b470156e1652abfad0e08d486d (diff) | |
download | system_core-70580b20bc8485002df0b3e89e42754c8c9796ff.zip system_core-70580b20bc8485002df0b3e89e42754c8c9796ff.tar.gz system_core-70580b20bc8485002df0b3e89e42754c8c9796ff.tar.bz2 |
am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"
* commit '149ae11fb63818b470156e1652abfad0e08d486d':
adb,fastboot: add USB support for Intel Vendor ID
Diffstat (limited to 'adb/usb_vendors.c')
-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 a8b0ca2..e34cd02 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -37,6 +37,8 @@ // Google's USB Vendor ID #define VENDOR_ID_GOOGLE 0x18d1 +// Intel's USB Vendor ID +#define VENDOR_ID_INTEL 0x8087 // HTC's USB Vendor ID #define VENDOR_ID_HTC 0x0bb4 // Samsung's USB Vendor ID @@ -121,6 +123,7 @@ /** built-in vendor list */ int builtInVendorIds[] = { VENDOR_ID_GOOGLE, + VENDOR_ID_INTEL, VENDOR_ID_HTC, VENDOR_ID_SAMSUNG, VENDOR_ID_MOTOROLA, |