diff --git a/arch/arm/mach-msm/include/mach/htc_usb.h b/arch/arm/mach-msm/include/mach/htc_usb.h
index baac489d..21029f58 100644
--- a/arch/arm/mach-msm/include/mach/htc_usb.h
+++ b/arch/arm/mach-msm/include/mach/htc_usb.h
@@ -16,7 +16,6 @@
 
 #ifdef CONFIG_USB_ANDROID
 #include <linux/usb/android_composite.h>
-#include <linux/usb/f_accessory.h>
 
 #ifdef CONFIG_ARCH_QSD8X50
 void msm_hsusb_8x50_phy_reset(void);
@@ -41,16 +40,6 @@ static char *usb_functions_rndis_adb[] = {
 };
 #endif
 
-#ifdef CONFIG_USB_ANDROID_ACCESSORY
-static char *usb_functions_accessory[] = {
-	"accessory"
-};
-static char *usb_functions_accessory_adb[] = {
-	"accessory",
-	"adb"
-};
-#endif
-
 #ifdef CONFIG_USB_ANDROID_PROJECTOR
 static char *usb_functions_projector[] = {
 	"usb_mass_storage",
@@ -127,9 +116,6 @@ static char *usb_functions_all[] = {
 #ifdef CONFIG_USB_ANDROID_RNDIS
 	"rndis",
 #endif
-#ifdef CONFIG_USB_ANDROID_ACCESSORY
-	"accessory",
-#endif
 #ifdef CONFIG_USB_ANDROID_MTP
 	"mtp",
 #endif
@@ -239,20 +225,6 @@ static struct android_usb_product usb_products[] = {
 		.functions	= usb_functions_rndis_adb,
 	},
 #endif
-#ifdef CONFIG_USB_ANDROID_ACCESSORY
-	{
-		.vendor_id	= USB_ACCESSORY_VENDOR_ID,
-		.product_id	= USB_ACCESSORY_PRODUCT_ID,
-		.num_functions	= ARRAY_SIZE(usb_functions_accessory),
-		.functions	= usb_functions_accessory,
-	},
-	{
-		.vendor_id	= USB_ACCESSORY_VENDOR_ID,
-		.product_id	= USB_ACCESSORY_ADB_PRODUCT_ID,
-		.num_functions	= ARRAY_SIZE(usb_functions_accessory_adb),
-		.functions	= usb_functions_accessory_adb,
-	},
-#endif
 };
 #endif