diff --git a/arch/arm64/configs/exynos7885-a7y18lte_defconfig b/arch/arm64/configs/exynos7885-a7y18lte_defconfig
index 0bacc6a0a..178a5f7d3 100644
--- a/arch/arm64/configs/exynos7885-a7y18lte_defconfig
+++ b/arch/arm64/configs/exynos7885-a7y18lte_defconfig
@@ -3466,6 +3466,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_G_ANDROID=y
 CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
+# CONFIG_USB_ANDROID_SAMSUNG_MTP is not set
 CONFIG_USB_DUN_SUPPORT=y
 # CONFIG_USB_RNDIS_MULTIPACKET_WITH_TIMER is not set
 # CONFIG_USB_RNDIS_VZW_REQ is not set
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8d8648317..44164b6c9 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -144,6 +144,15 @@ config USB_ANDROID_SAMSUNG_COMPOSITE
 	  Multi Configuration.
 	  If you enable this option, android composite will be changed.
 
+config USB_ANDROID_SAMSUNG_MTP
+	boolean "Samsung MTP function"
+	depends on USB_G_ANDROID && !SEC_FACTORY
+	help
+	  Provides Media Transfer Protocol (MTP) support
+	  for samsung gadget driver.
+	  If you enable this option,
+	  google mtp will be changed to samsung mtp.
+    
 config USB_DUN_SUPPORT
 	boolean "DUN support function"
 	depends on USB_G_ANDROID
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index f6125a961..46ebee31b 100644
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -54,8 +54,13 @@ ifeq ($(CONFIG_SEC_FACTORY),y)
 	usb_f_mtp-y                     := f_mtp.o
 	obj-$(CONFIG_USB_F_MTP)         += usb_f_mtp.o
 else
-	usb_f_mtp_samsung-y                     := f_mtp_samsung.o
-	obj-$(CONFIG_USB_F_MTP)         += usb_f_mtp_samsung.o
+ifeq ($(CONFIG_USB_ANDROID_SAMSUNG_MTP),y)
+	usb_f_mtp_samsung-y     := f_mtp_samsung.o
+	obj-$(CONFIG_USB_F_MTP) += usb_f_mtp_samsung.o
+else
+	usb_f_mtp-y             := f_mtp.o
+        obj-$(CONFIG_USB_F_MTP) += usb_f_mtp.o
+endif
 endif
 usb_f_ptp-y                     := f_ptp.o
 obj-$(CONFIG_USB_F_PTP)         += usb_f_ptp.o