diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/usbip/Makefile | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip/Makefile')
| -rw-r--r-- | drivers/staging/usbip/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile index 6f2916b..279f3cc 100644 --- a/drivers/staging/usbip/Makefile +++ b/drivers/staging/usbip/Makefile @@ -1,12 +1,11 @@ obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o -usbip_common_mod-objs := usbip_common.o usbip_event.o +usbip_common_mod-y := usbip_common.o usbip_event.o obj-$(CONFIG_USB_IP_VHCI_HCD) += vhci-hcd.o -vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o +vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o obj-$(CONFIG_USB_IP_HOST) += usbip.o -usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o +usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o + +ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG -ifeq ($(CONFIG_USB_IP_DEBUG_ENABLE),y) - EXTRA_CFLAGS += -DDEBUG -endif |
