diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/staging/usbip/Makefile | |
| parent | telephony: fix return value (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip | |
Merge branch 'master' into for-next
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 6f2916b1807a..279f3cc3eea8 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 |