am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"

* commit '003771d1c0ad6c3c6cd0c82f787636111c9e193c':
  correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
This commit is contained in:
Mike Lockwood 2011-08-15 10:25:47 -07:00 committed by Android Git Automerger
commit 549bfcda6d

View file

@ -97,8 +97,10 @@
#define VENDOR_ID_COMPAL 0x1219 #define VENDOR_ID_COMPAL 0x1219
// T & A Mobile Phones' USB Vendor ID // T & A Mobile Phones' USB Vendor ID
#define VENDOR_ID_T_AND_A 0x1BBB #define VENDOR_ID_T_AND_A 0x1BBB
// LenovoMobile's USB Vendor ID
#define VENDOR_ID_LENOVOMOBILE 0x2006
// Lenovo's USB Vendor ID // Lenovo's USB Vendor ID
#define VENDOR_ID_LENOVO 0x2006 #define VENDOR_ID_LENOVO 0x17EF
// Vizio's USB Vendor ID // Vizio's USB Vendor ID
#define VENDOR_ID_VIZIO 0xE040 #define VENDOR_ID_VIZIO 0xE040
@ -136,6 +138,7 @@ int builtInVendorIds[] = {
VENDOR_ID_IRIVER, VENDOR_ID_IRIVER,
VENDOR_ID_COMPAL, VENDOR_ID_COMPAL,
VENDOR_ID_T_AND_A, VENDOR_ID_T_AND_A,
VENDOR_ID_LENOVOMOBILE,
VENDOR_ID_LENOVO, VENDOR_ID_LENOVO,
VENDOR_ID_VIZIO, VENDOR_ID_VIZIO,
}; };