usb gadget: new "CDC Composite" gadget driver

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / Makefile

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 16211435761f0c44ea66603d2cabe9e83168444c..fcb5cb9094d905d7e26c35a7dae074fc28b633bd 100644 (file)
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -22,18 +22,22 @@ obj-$(CONFIG_USB_M66592)    += m66592-udc.o
 #
 # USB gadget drivers
 #
-g_zero-objs                    := zero.o usbstring.o config.o epautoconf.o
-g_ether-objs                   := ether.o usbstring.o config.o epautoconf.o
-g_serial-objs                  := serial.o u_serial.o usbstring.o config.o epautoconf.o
+C_UTILS =      composite.o usbstring.o config.o epautoconf.o
+
+g_zero-objs                    := zero.o f_sourcesink.o f_loopback.o $(C_UTILS)
+g_ether-objs                   := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
+g_serial-objs                  := serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)
 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
 g_printer-objs                 := printer.o usbstring.o config.o \
                                        epautoconf.o
+g_cdc-objs                     := cdc2.o u_ether.o f_ecm.o \
+                                       u_serial.o f_acm.o $(C_UTILS)
 
 ifeq ($(CONFIG_USB_ETH_RNDIS),y)
-       g_ether-objs            += rndis.o
+       g_ether-objs            += f_rndis.o rndis.o
 endif
  
 obj-$(CONFIG_USB_ZERO)         += g_zero.o
@@ -43,4 +47,5 @@ obj-$(CONFIG_USB_FILE_STORAGE)        += g_file_storage.o
 obj-$(CONFIG_USB_G_SERIAL)     += g_serial.o
 obj-$(CONFIG_USB_G_PRINTER)    += g_printer.o
 obj-$(CONFIG_USB_MIDI_GADGET)  += g_midi.o
+obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o