Permalink
Browse files

Merge branch 'usb-gadget-merge'

Conflicts:
	drivers/target/Makefile
  • Loading branch information...
nablio3000 committed Apr 14, 2012
2 parents 2b6f415 + 2ac2f25 commit f3112d0752f41d78cc33ba9f09e00858d1995cae
View
@@ -27,5 +27,5 @@ obj-$(CONFIG_LOOPBACK_TARGET) += loopback/
obj-$(CONFIG_TCM_FC) += tcm_fc/
obj-$(CONFIG_ISCSI_TARGET) += iscsi/
obj-$(CONFIG_TCM_VHOST) += tcm_vhost/
obj-$(CONFIG_TARGET_USB_GADGET) += usb-gadget/
obj-$(CONFIG_TCM_USB_GADGET) += usb-gadget/
obj-$(CONFIG_SBP_TARGET) += sbp/
@@ -1,7 +1,3 @@
CFLAGS_gadget.o := -I$(srctree)/drivers/usb/gadget
tcm_usb_gadget-objs := configfs.o \
fabric.o \
bot.o \
uas.o \
gadget.o
CFLAGS_usb_gadget.o := -I$(srctree)/drivers/usb/gadget
tcm_usb_gadget-objs := usb_gadget.o
obj-$(CONFIG_TARGET_USB_GADGET) += tcm_usb_gadget.o
Oops, something went wrong.

0 comments on commit f3112d0

Please sign in to comment.