MTP: force generic mtp driver instead of Samsung one

diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index 05a6618a3e9ffb25597b3947ed6b3453e2c0dfef..6b33f9d82f00628aca744711649990d98895e9e5 100644 (file)
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -48,13 +48,8 @@ usb_f_dm-y                   := f_dm.o
 obj-$(CONFIG_USB_CONFIGFS_F_DM)        += usb_f_dm.o
 usb_f_adb-y                    := f_adb.o
 obj-$(CONFIG_USB_CONFIGFS_F_ADB)+= usb_f_adb.o
-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
-endif
+usb_f_mtp-y                     := f_mtp.o
+obj-$(CONFIG_USB_F_MTP)         += usb_f_mtp.o
 usb_f_ptp-y                     := f_ptp.o
 obj-$(CONFIG_USB_F_PTP)         += usb_f_ptp.o
 usb_f_audio_source-y            := f_audio_source.o

diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
index bf8fec128d258455ccaad7111ec5de766f63cc48..1363f0e89dccf30a8a07561fa6cff5f264fd6612 100644 (file)
--- a/drivers/usb/gadget/function/f_mtp.c
+++ b/drivers/usb/gadget/function/f_mtp.c
@@ -38,7 +38,7 @@
 #include <linux/configfs.h>
 #include <linux/usb/composite.h>
 
-#include "configfs.h"
+#include "../configfs.h"
 
 #define MTP_BULK_BUFFER_SIZE       16384
 #define INTR_BUFFER_SIZE           28