resolved conflicts for merge of 190cabb3 to master

2010-02-02 08:35:43 -08:00 · 2010-02-02 08:35:43 -08:00 · 3332d6e69d
parent 4ab909d044 190cabb376
commit 3332d6e69d
1 changed files with 3 additions and 0 deletions
--- 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]))