usb gadget zero: use composite gadget framework

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

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index c3aab80b6c76e33095556539f15f2377a14d8adf..fe60cca704d963c1c61eacb56640464493d3cf63 100644 (file)
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -8,7 +8,8 @@ endif
 obj-$(CONFIG_USB_DUMMY_HCD)    += dummy_hcd.o
 obj-$(CONFIG_USB_NET2280)      += net2280.o
 obj-$(CONFIG_USB_AMD5536UDC)   += amd5536udc.o
-obj-$(CONFIG_USB_PXA2XX)       += pxa2xx_udc.o
+obj-$(CONFIG_USB_PXA25X)       += pxa25x_udc.o
+obj-$(CONFIG_USB_PXA27X)       += pxa27x_udc.o
 obj-$(CONFIG_USB_GOKU)         += goku_udc.o
 obj-$(CONFIG_USB_OMAP)         += omap_udc.o
 obj-$(CONFIG_USB_LH7A40X)      += lh7a40x_udc.o
@@ -21,9 +22,11 @@ obj-$(CONFIG_USB_M66592)     += m66592-udc.o
 #
 # USB gadget drivers
 #
-g_zero-objs                    := zero.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 usbstring.o config.o epautoconf.o
-g_serial-objs                  := serial.o usbstring.o config.o epautoconf.o
+g_serial-objs                  := serial.o u_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 \