diff options
Diffstat (limited to 'patches.tizen/0680-usb-gadget-mass_storage-merge-usb_f_mass_storage-mod.patch')
| -rw-r--r-- | patches.tizen/0680-usb-gadget-mass_storage-merge-usb_f_mass_storage-mod.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/patches.tizen/0680-usb-gadget-mass_storage-merge-usb_f_mass_storage-mod.patch b/patches.tizen/0680-usb-gadget-mass_storage-merge-usb_f_mass_storage-mod.patch new file mode 100644 index 00000000000..1eb82e30676 --- /dev/null +++ b/patches.tizen/0680-usb-gadget-mass_storage-merge-usb_f_mass_storage-mod.patch @@ -0,0 +1,80 @@ +From 2e3f33eddfca46f0d4909d496f6309454b8da298 Mon Sep 17 00:00:00 2001 +From: Andrzej Pietrasiewicz <andrzej.p@samsung.com> +Date: Thu, 11 Jul 2013 13:24:00 +0200 +Subject: [PATCH 0680/1302] usb/gadget: mass_storage: merge usb_f_mass_storage + module with u_ms module + +u_ms.ko is needed only together with usb_f_mass_storage.ko. Merge them. + +Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> +Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> +Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> +--- + drivers/usb/gadget/Kconfig | 7 ------- + drivers/usb/gadget/Makefile | 4 +--- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig +index 49e7004..84ac134 100644 +--- a/drivers/usb/gadget/Kconfig ++++ b/drivers/usb/gadget/Kconfig +@@ -537,9 +537,6 @@ config USB_F_SUBSET + config USB_F_RNDIS + tristate + +-config USB_U_MS +- tristate +- + config USB_F_MASS_STORAGE + tristate + +@@ -683,7 +680,6 @@ config USB_CONFIGFS_PHONET + config USB_CONFIGFS_MASS_STORAGE + boolean "Mass storage" + depends on USB_CONFIGFS +- select USB_U_MS + select USB_F_MASS_STORAGE + help + The Mass Storage Gadget acts as a USB Mass Storage disk drive. +@@ -907,7 +903,6 @@ config USB_MASS_STORAGE + tristate "Mass Storage Gadget" + depends on BLOCK + select USB_LIBCOMPOSITE +- select USB_U_MS + select USB_F_MASS_STORAGE + help + The Mass Storage Gadget acts as a USB Mass Storage disk drive. +@@ -1032,7 +1027,6 @@ config USB_G_ACM_MS + select USB_LIBCOMPOSITE + select USB_U_SERIAL + select USB_F_ACM +- select USB_U_MS + select USB_F_MASS_STORAGE + help + This driver provides two functions in one configuration: +@@ -1049,7 +1043,6 @@ config USB_G_MULTI + select USB_U_SERIAL + select USB_U_ETHER + select USB_F_ACM +- select USB_U_MS + select USB_F_MASS_STORAGE + help + The Multifunction Composite Gadget provides Ethernet (RNDIS +diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile +index d232706..f106645 100644 +--- a/drivers/usb/gadget/Makefile ++++ b/drivers/usb/gadget/Makefile +@@ -60,9 +60,7 @@ usb_f_ecm_subset-y := f_subset.o + obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o + usb_f_rndis-y := f_rndis.o + obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o +-u_ms-y := storage_common.o +-obj-$(CONFIG_USB_U_MS) += u_ms.o +-usb_f_mass_storage-y := f_mass_storage.o ++usb_f_mass_storage-y := f_mass_storage.o storage_common.o + obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o + + # +-- +1.8.3.2 + |