am e76343ef: Merge "Emerson USB ID"

* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID
This commit is contained in:
Colin Cross 2014-01-11 23:09:48 -08:00 committed by Android Git Automerger
commit e0e7595f3c

View file

@ -58,6 +58,8 @@
#define VENDOR_ID_ECS 0x03fc #define VENDOR_ID_ECS 0x03fc
// EMERGING_TECH's USB Vendor ID // EMERGING_TECH's USB Vendor ID
#define VENDOR_ID_EMERGING_TECH 0x297F #define VENDOR_ID_EMERGING_TECH 0x297F
// Emerson's USB Vendor ID
#define VENDOR_ID_EMERSON 0x2207
// Foxconn's USB Vendor ID // Foxconn's USB Vendor ID
#define VENDOR_ID_FOXCONN 0x0489 #define VENDOR_ID_FOXCONN 0x0489
// Fujitsu's USB Vendor ID // Fujitsu's USB Vendor ID
@ -192,6 +194,7 @@ int builtInVendorIds[] = {
VENDOR_ID_DELL, VENDOR_ID_DELL,
VENDOR_ID_ECS, VENDOR_ID_ECS,
VENDOR_ID_EMERGING_TECH, VENDOR_ID_EMERGING_TECH,
VENDOR_ID_EMERSON,
VENDOR_ID_FOXCONN, VENDOR_ID_FOXCONN,
VENDOR_ID_FUJITSU, VENDOR_ID_FUJITSU,
VENDOR_ID_FUNAI, VENDOR_ID_FUNAI,