summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-10-15 11:57:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 11:57:14 -0700
commitfa5c690d93b92ccf57a0522c498ca2076a7ad98d (patch)
treeabd4a144121e3acc06dbc72ee25fe67cb1a7d182 /adb
parent287a9585dc85bff9b81e962f6be4f2b36512d345 (diff)
parent89aff1d22662c64cc2de384e7e2c699e4d1d5d47 (diff)
downloadsystem_core-fa5c690d93b92ccf57a0522c498ca2076a7ad98d.zip
system_core-fa5c690d93b92ccf57a0522c498ca2076a7ad98d.tar.gz
system_core-fa5c690d93b92ccf57a0522c498ca2076a7ad98d.tar.bz2
am 89aff1d2: Add Asus USB vendor ID to adb.
Merge commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47' into gingerbread-plus-aosp * commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47': Add Asus USB vendor ID to adb.
Diffstat (limited to 'adb')
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index bebac2d..deb2ec8 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -81,6 +81,8 @@
#define VENDOR_ID_SK_TELESYS 0x1F53
// KT Tech's USB Vendor ID
#define VENDOR_ID_KT_TECH 0x2116
+// Asus's USB Vendor ID
+#define VENDOR_ID_ASUS 0x0b05
/** built-in vendor list */
@@ -108,6 +110,7 @@ int builtInVendorIds[] = {
VENDOR_ID_TOSHIBA,
VENDOR_ID_SK_TELESYS,
VENDOR_ID_KT_TECH,
+ VENDOR_ID_ASUS,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))