mirror of
https://github.com/torvalds/linux.git
synced 2024-12-10 05:01:26 +00:00
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: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
7a93d040e0
commit
8254baccdd
@ -525,9 +525,6 @@ config USB_F_SUBSET
|
|||||||
config USB_F_RNDIS
|
config USB_F_RNDIS
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
config USB_U_MS
|
|
||||||
tristate
|
|
||||||
|
|
||||||
config USB_F_MASS_STORAGE
|
config USB_F_MASS_STORAGE
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
@ -671,7 +668,6 @@ config USB_CONFIGFS_PHONET
|
|||||||
config USB_CONFIGFS_MASS_STORAGE
|
config USB_CONFIGFS_MASS_STORAGE
|
||||||
boolean "Mass storage"
|
boolean "Mass storage"
|
||||||
depends on USB_CONFIGFS
|
depends on USB_CONFIGFS
|
||||||
select USB_U_MS
|
|
||||||
select USB_F_MASS_STORAGE
|
select USB_F_MASS_STORAGE
|
||||||
help
|
help
|
||||||
The Mass Storage Gadget acts as a USB Mass Storage disk drive.
|
The Mass Storage Gadget acts as a USB Mass Storage disk drive.
|
||||||
@ -895,7 +891,6 @@ config USB_MASS_STORAGE
|
|||||||
tristate "Mass Storage Gadget"
|
tristate "Mass Storage Gadget"
|
||||||
depends on BLOCK
|
depends on BLOCK
|
||||||
select USB_LIBCOMPOSITE
|
select USB_LIBCOMPOSITE
|
||||||
select USB_U_MS
|
|
||||||
select USB_F_MASS_STORAGE
|
select USB_F_MASS_STORAGE
|
||||||
help
|
help
|
||||||
The Mass Storage Gadget acts as a USB Mass Storage disk drive.
|
The Mass Storage Gadget acts as a USB Mass Storage disk drive.
|
||||||
@ -1020,7 +1015,6 @@ config USB_G_ACM_MS
|
|||||||
select USB_LIBCOMPOSITE
|
select USB_LIBCOMPOSITE
|
||||||
select USB_U_SERIAL
|
select USB_U_SERIAL
|
||||||
select USB_F_ACM
|
select USB_F_ACM
|
||||||
select USB_U_MS
|
|
||||||
select USB_F_MASS_STORAGE
|
select USB_F_MASS_STORAGE
|
||||||
help
|
help
|
||||||
This driver provides two functions in one configuration:
|
This driver provides two functions in one configuration:
|
||||||
@ -1037,7 +1031,6 @@ config USB_G_MULTI
|
|||||||
select USB_U_SERIAL
|
select USB_U_SERIAL
|
||||||
select USB_U_ETHER
|
select USB_U_ETHER
|
||||||
select USB_F_ACM
|
select USB_F_ACM
|
||||||
select USB_U_MS
|
|
||||||
select USB_F_MASS_STORAGE
|
select USB_F_MASS_STORAGE
|
||||||
help
|
help
|
||||||
The Multifunction Composite Gadget provides Ethernet (RNDIS
|
The Multifunction Composite Gadget provides Ethernet (RNDIS
|
||||||
|
@ -60,9 +60,7 @@ usb_f_ecm_subset-y := f_subset.o
|
|||||||
obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o
|
obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o
|
||||||
usb_f_rndis-y := f_rndis.o
|
usb_f_rndis-y := f_rndis.o
|
||||||
obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o
|
obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o
|
||||||
u_ms-y := storage_common.o
|
usb_f_mass_storage-y := f_mass_storage.o storage_common.o
|
||||||
obj-$(CONFIG_USB_U_MS) += u_ms.o
|
|
||||||
usb_f_mass_storage-y := f_mass_storage.o
|
|
||||||
obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
|
obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user