--- arch/arm/mach-msm/include/mach/htc_usb.h

+++ arch/arm/mach-msm/include/mach/htc_usb.h

@@ -108,6 +108,17 @@ static char *usb_functions_diag_serial[]

#endif

#endif

+#ifdef CONFIG_USB_ANDROID_ACM

+static char *usb_functions_adb_acm[] = {

+ "usb_mass_storage",

+ "adb",

+ "acm",

+};

+static char *usb_functions_acm[] = {

+ "acm",

+};

+#endif

+

static char *usb_functions_all[] = {

#ifdef CONFIG_USB_ANDROID_RNDIS

"ether",

@@ -126,6 +137,9 @@ static char *usb_functions_all[] = {

#ifdef CONFIG_USB_ANDROID_PROJECTOR

"projector",

#endif

+#ifdef CONFIG_USB_ANDROID_ACM

+ "acm",

+#endif

};

static struct android_usb_product usb_products[] = {

@@ -139,6 +153,18 @@ static struct android_usb_product usb_pr

.num_functions = ARRAY_SIZE(usb_functions_ums),

.functions = usb_functions_ums,

},

+#ifdef CONFIG_USB_ANDROID_ACM

+ {

+ .product_id = 0x0ff4,

+ .num_functions = ARRAY_SIZE(usb_functions_acm),

+ .functions = usb_functions_acm,

+ },

+ {

+ .product_id = 0x0ff5,

+ .num_functions = ARRAY_SIZE(usb_functions_adb_acm),

+ .functions = usb_functions_adb_acm,

+ },

+#endif

#ifdef CONFIG_USB_ANDROID_SERIAL

{

.product_id = 0x0c03,