diff options
| author | Vitaly Kuzmichev <vkuzmichev@mvista.com> | 2010-08-12 16:44:39 +0400 |
|---|---|---|
| committer | Remy Bohmer <linux@bohmer.net> | 2010-09-20 21:57:16 +0200 |
| commit | 7b2f3906113c5bee6e0bfc0e9ee92c2be3e99edb (patch) | |
| tree | a4948b57270fed21625011cec957329642a0fa04 /drivers/usb | |
| parent | 23cd138503f90ff6af109c0096727ba641942614 (diff) | |
| download | talos-obmc-uboot-7b2f3906113c5bee6e0bfc0e9ee92c2be3e99edb.tar.gz talos-obmc-uboot-7b2f3906113c5bee6e0bfc0e9ee92c2be3e99edb.zip | |
USB-CDC: Restuct USB gadget Makefile
Prohibit simultaneous usage of both old and new gadget stacks and
allow UDC drivers to be dependent on CONFIG_USB_ETHER.
Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 9b1b55b41b..8e6b26e261 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -25,6 +25,10 @@ include $(TOPDIR)/config.mk LIB := $(obj)libusb_gadget.a +# new USB gadget layer dependencies +ifdef CONFIG_USB_ETHER +COBJS-y += ether.o epautoconf.o config.o usbstring.o +else # Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE ifdef CONFIG_USB_DEVICE COBJS-y += core.o @@ -35,8 +39,7 @@ 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 +endif COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) |
