Kconfig modifications for USB Composite gadget support.
Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
Signed-off-by: Ragner Magalhaes <[EMAIL PROTECTED]>
:100644 100644 8065f2b... cdebff8... M drivers/usb/gadget/Kconfig
:100644 100644 5db1939... 4c72717... M drivers/usb/gadget/Makefile
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8065f2b..cdebff8 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -293,6 +293,16 @@ choice
# this first set of drivers all depend on bulk-capable hardware.
+config USB_COMPOSITE
+ tristate "Composite Gadget Support"
+ depends on USB_GADGET
+ help
+ The Composite Gadget is a gadget driver that allow to work
+ with multiples gadget functions together.
+
+ This module adds support for File Storage and Ethernet Gadget
+ to work as Composite Gadget.
+
config USB_ZERO
tristate "Gadget Zero (DEVELOPMENT)"
depends on EXPERIMENTAL
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 5db1939..4c72717 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -13,13 +13,19 @@ obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o
#
# USB gadget drivers
#
+ifndef CONFIG_USB_COMPOSITE
+GADGET := gadget.o
+endif
g_zero-objs := zero.o usbstring.o config.o epautoconf.o
-g_ether-objs := ether.o usbstring.o config.o epautoconf.o
+g_ether-objs := ether.o usbstring.o config.o epautoconf.o \
+ $(GADGET)
g_serial-objs := serial.o usbstring.o config.o epautoconf.o
g_midi-objs := gmidi.o usbstring.o config.o epautoconf.o
gadgetfs-objs := inode.o
g_file_storage-objs := file_storage.o usbstring.o config.o \
- epautoconf.o
+ epautoconf.o $(GADGET)
+g_composite-objs := composite.o usbstring.o config.o \
+ epautoconf.o
ifeq ($(CONFIG_USB_ETH_RNDIS),y)
g_ether-objs += rndis.o
@@ -31,4 +37,4 @@ obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o
obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o
obj-$(CONFIG_USB_G_SERIAL) += g_serial.o
obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o
-
+obj-$(CONFIG_USB_COMPOSITE) += g_composite.o
--
1.5.0.4.501.gb08b
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
