aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/Kconfig
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2013-05-23 03:22:03 -0400
committerFelipe Balbi <balbi@ti.com>2013-06-10 10:10:57 -0400
commitf1a1823ff24fa4e3412b5078f20021cf40834946 (patch)
tree7ede1143ae2a4945b5ed9f5292c84d39edea86b6 /drivers/usb/gadget/Kconfig
parentd68c277b501889b3a50c179d1c3d704db7947b83 (diff)
usb: gadget: u_ether: convert into module
u_ether.c has been #include'd by all gadgets which implement USB Ethernet functions. In order to add configfs support, the f_ecm.c, f_eem.c, f_ncm.c, f_subset.c, f_rndis.c need to be converted into modules and must not be #include'd. Consequently, the u_ether.c needs to be a module too, in a manner similar to u_serial.c. The resulting module should not take any parameters, so they are pushed to the current users of it, that is ether.c, g_ffs.c, multi.c, ncm.c, nokia.c. 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>
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r--drivers/usb/gadget/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index f9bf7283e538..d5ae4dff3b90 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -499,6 +499,9 @@ config USB_F_SS_LB
499config USB_U_SERIAL 499config USB_U_SERIAL
500 tristate 500 tristate
501 501
502config USB_U_ETHER
503 tristate
504
502config USB_F_SERIAL 505config USB_F_SERIAL
503 tristate 506 tristate
504 507
@@ -595,6 +598,7 @@ config USB_ETH
595 tristate "Ethernet Gadget (with CDC Ethernet support)" 598 tristate "Ethernet Gadget (with CDC Ethernet support)"
596 depends on NET 599 depends on NET
597 select USB_LIBCOMPOSITE 600 select USB_LIBCOMPOSITE
601 select USB_U_ETHER
598 select CRC32 602 select CRC32
599 help 603 help
600 This driver implements Ethernet style communication, in one of 604 This driver implements Ethernet style communication, in one of
@@ -667,6 +671,7 @@ config USB_G_NCM
667 tristate "Network Control Model (NCM) support" 671 tristate "Network Control Model (NCM) support"
668 depends on NET 672 depends on NET
669 select USB_LIBCOMPOSITE 673 select USB_LIBCOMPOSITE
674 select USB_U_ETHER
670 select CRC32 675 select CRC32
671 help 676 help
672 This driver implements USB CDC NCM subclass standard. NCM is 677 This driver implements USB CDC NCM subclass standard. NCM is
@@ -710,6 +715,7 @@ config USB_FUNCTIONFS
710config USB_FUNCTIONFS_ETH 715config USB_FUNCTIONFS_ETH
711 bool "Include configuration with CDC ECM (Ethernet)" 716 bool "Include configuration with CDC ECM (Ethernet)"
712 depends on USB_FUNCTIONFS && NET 717 depends on USB_FUNCTIONFS && NET
718 select USB_U_ETHER
713 help 719 help
714 Include a configuration with CDC ECM function (Ethernet) and the 720 Include a configuration with CDC ECM function (Ethernet) and the
715 Function Filesystem. 721 Function Filesystem.
@@ -717,6 +723,7 @@ config USB_FUNCTIONFS_ETH
717config USB_FUNCTIONFS_RNDIS 723config USB_FUNCTIONFS_RNDIS
718 bool "Include configuration with RNDIS (Ethernet)" 724 bool "Include configuration with RNDIS (Ethernet)"
719 depends on USB_FUNCTIONFS && NET 725 depends on USB_FUNCTIONFS && NET
726 select USB_U_ETHER
720 help 727 help
721 Include a configuration with RNDIS function (Ethernet) and the Filesystem. 728 Include a configuration with RNDIS function (Ethernet) and the Filesystem.
722 729
@@ -817,6 +824,7 @@ config USB_CDC_COMPOSITE
817 depends on NET 824 depends on NET
818 select USB_LIBCOMPOSITE 825 select USB_LIBCOMPOSITE
819 select USB_U_SERIAL 826 select USB_U_SERIAL
827 select USB_U_ETHER
820 select USB_F_ACM 828 select USB_F_ACM
821 help 829 help
822 This driver provides two functions in one configuration: 830 This driver provides two functions in one configuration:
@@ -834,6 +842,7 @@ config USB_G_NOKIA
834 depends on PHONET 842 depends on PHONET
835 select USB_LIBCOMPOSITE 843 select USB_LIBCOMPOSITE
836 select USB_U_SERIAL 844 select USB_U_SERIAL
845 select USB_U_ETHER
837 select USB_F_ACM 846 select USB_F_ACM
838 help 847 help
839 The Nokia composite gadget provides support for acm, obex 848 The Nokia composite gadget provides support for acm, obex
@@ -861,6 +870,7 @@ config USB_G_MULTI
861 select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS 870 select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
862 select USB_LIBCOMPOSITE 871 select USB_LIBCOMPOSITE
863 select USB_U_SERIAL 872 select USB_U_SERIAL
873 select USB_U_ETHER
864 select USB_F_ACM 874 select USB_F_ACM
865 help 875 help
866 The Multifunction Composite Gadget provides Ethernet (RNDIS 876 The Multifunction Composite Gadget provides Ethernet (RNDIS