summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/Makefile
diff options
context:
space:
mode:
authorRemy Bohmer <linux@bohmer.net>2009-07-29 18:18:43 +0200
committerRemy Bohmer <linux@bohmer.net>2010-09-20 21:57:16 +0200
commit23cd138503f90ff6af109c0096727ba641942614 (patch)
tree9c9a9c4b109a4fc1f0ca989bf2b8fa3bfb23d279 /drivers/usb/gadget/Makefile
parent70fccb3f2469f5cfd75ad17c6e452a382fbabbcf (diff)
downloadtalos-obmc-uboot-23cd138503f90ff6af109c0096727ba641942614.tar.gz
talos-obmc-uboot-23cd138503f90ff6af109c0096727ba641942614.zip
Integrate USB gadget layer and USB CDC driver layer
Derived from Linux kernel 2.6.27 Signed-off-by: Thomas Smits <ts.smits@gmail.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
Diffstat (limited to 'drivers/usb/gadget/Makefile')
-rw-r--r--drivers/usb/gadget/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 1d7362dc97..9b1b55b41b 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libusb_gadget.a
+# Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
ifdef CONFIG_USB_DEVICE
COBJS-y += core.o
COBJS-y += ep0.o
@@ -34,6 +35,8 @@ COBJS-$(CONFIG_MPC885_FAMILY) += mpc8xx_udc.o
COBJS-$(CONFIG_PXA27X) += pxa27x_udc.o
COBJS-$(CONFIG_SPEARUDC) += spr_udc.o
endif
+# new USB gadget layer dependencies
+COBJS-$(CONFIG_USB_ETHER) += ether.o epautoconf.o config.o usbstring.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OpenPOWER on IntegriCloud