diff options
| author | Raphael <raphael@google.com> | 2010-02-02 08:35:43 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-02-02 08:35:43 -0800 |
| commit | 3332d6e69d3182a756c029e9d499a78f17c4b17a (patch) | |
| tree | 667d2d62b63cf0f3d351f21bb257ace4200f9bf9 /adb | |
| parent | 4ab909d044eb6dec592171e1d6f6055dbfd57d0b (diff) | |
| parent | 190cabb376d9a393b65a0d8c123196bf58ef7ab4 (diff) | |
| download | system_core-3332d6e69d3182a756c029e9d499a78f17c4b17a.tar.gz system_core-3332d6e69d3182a756c029e9d499a78f17c4b17a.tar.bz2 system_core-3332d6e69d3182a756c029e9d499a78f17c4b17a.zip | |
resolved conflicts for merge of 190cabb3 to master
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 b98c8ad1..73bf4184 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -57,6 +57,8 @@ #define VENDOR_ID_DELL 0x413c // Nvidia's USB Vendor ID #define VENDOR_ID_NVIDIA 0x0955 +// Garmin-Asus's USB Vendor ID +#define VENDOR_ID_GARMIN_ASUS 0x091E /** built-in vendor list */ @@ -72,6 +74,7 @@ int builtInVendorIds[] = { VENDOR_ID_FOXCONN, VENDOR_ID_DELL, VENDOR_ID_NVIDIA, + VENDOR_ID_GARMIN_ASUS, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |