diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-11 09:31:18 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-11 09:31:18 -0600 |
| commit | b207892b061da7608878e273ae22ba9bf9be264b (patch) | |
| tree | 51daa46b89b83cad422941f52110b19571b85b79 /drivers/usb/usbip/Makefile | |
| parent | 018a17bdc8658ad448497c84d4ba21b6985820ec (diff) | |
| parent | a516440542afcb9647f88d12c35640baf02d07ea (diff) | |
Merge branch 'for-linus' into for-3.18/core
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c
Diffstat (limited to 'drivers/usb/usbip/Makefile')
| -rw-r--r-- | drivers/usb/usbip/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/usbip/Makefile b/drivers/usb/usbip/Makefile new file mode 100644 index 000000000000..9ecd61545be1 --- /dev/null +++ b/drivers/usb/usbip/Makefile @@ -0,0 +1,10 @@ +ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG + +obj-$(CONFIG_USBIP_CORE) += usbip-core.o +usbip-core-y := usbip_common.o usbip_event.o + +obj-$(CONFIG_USBIP_VHCI_HCD) += vhci-hcd.o +vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o + +obj-$(CONFIG_USBIP_HOST) += usbip-host.o +usbip-host-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o |