From 06586666e609fe78024f1b4e40fc08ee9e9957e3 Mon Sep 17 00:00:00 2001 From: Fevax Date: Tue, 12 Sep 2017 20:38:33 -0300 Subject: [PATCH] MTP: force generic mtp driver instead of Samsung one --- drivers/usb/gadget/function/Makefile | 9 ++------- drivers/usb/gadget/function/f_mtp.c | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile index 05a6618a3e9f..6b33f9d82f00 100644 --- 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 bf8fec128d25..1363f0e89dcc 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -38,7 +38,7 @@ #include #include -#include "configfs.h" +#include "../configfs.h" #define MTP_BULK_BUFFER_SIZE 16384 #define INTR_BUFFER_SIZE 28 -- 2.20.1