From 1ac63eca970fd77f3563fdae80fdbe10c423ff55 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 26 Sep 2011 22:32:01 -0700 Subject: USB: gadget: f_mtp: Add PTP variant of MTP USB function This is the same as MTP but with PTP interface descriptor. Also removed obsolete ioctl for switching between MTP and PTP mode Change-Id: Iceb82bb327b2c9c1bb3a97a4e0255490d47f20f5 Signed-off-by: Mike Lockwood Merge conflict resolve: Signed-off-by: Praneeth Bajjuri --- include/linux/usb/f_mtp.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/linux') diff --git a/include/linux/usb/f_mtp.h b/include/linux/usb/f_mtp.h index 3f1795def0a..3c6a58bd4ec 100644 --- a/include/linux/usb/f_mtp.h +++ b/include/linux/usb/f_mtp.h @@ -18,9 +18,6 @@ #ifndef __LINUX_USB_F_MTP_H #define __LINUX_USB_F_MTP_H -/* Constants for MTP_SET_INTERFACE_MODE */ -#define MTP_INTERFACE_MODE_MTP 0 -#define MTP_INTERFACE_MODE_PTP 1 #include @@ -69,8 +66,6 @@ struct mtp_event { * The file is created if it does not exist. */ #define MTP_RECEIVE_FILE _IOW('M', 1, struct mtp_file_range) -/* Sets the driver mode to either MTP or PTP */ -#define MTP_SET_INTERFACE_MODE _IOW('M', 2, int) /* Sends an event to the host via the interrupt endpoint */ #define MTP_SEND_EVENT _IOW('M', 3, struct mtp_event) /* Sends the specified file range to the host, -- cgit v1.2.3