summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/Makefile
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-06-15 17:34:25 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:38:04 -0800
commitc386e49d9c9de1069be3d6636b0e9d5f053afe83 (patch)
tree648123ee6445767ed378250691fdd6a6bea51493 /drivers/usb/gadget/Makefile
parent173ef52606b64b89b6ea91381d8372153e7a2a25 (diff)
USB: gadget: f_mass_storage: Integrate android customizations
Integrate support for android composite driver and platform data within CONFIG_USB_ANDROID_MASS_STORAGE. Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb/gadget/Makefile')
-rw-r--r--drivers/usb/gadget/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index fc717cd2b88c..1016d69163b1 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -72,5 +72,5 @@ obj-$(CONFIG_USB_G_NCM) += g_ncm.o
obj-$(CONFIG_USB_ANDROID) += android.o
obj-$(CONFIG_USB_ANDROID_ACM) += f_acm.o u_serial.o
obj-$(CONFIG_USB_ANDROID_ADB) += f_adb.o
-obj-$(CONFIG_USB_ANDROID_MASS_STORAGE) += f_mass_storage_tmp.o
+obj-$(CONFIG_USB_ANDROID_MASS_STORAGE) += f_mass_storage.o
obj-$(CONFIG_USB_ANDROID_RNDIS) += f_rndis.o u_ether.o