diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
| commit | 1aaaa9acaea1dd2878d6c92b45e4c117ef425baf (patch) | |
| tree | f1fe5948a6da8850862ae751da0b62dac351517f /drivers/s390/virtio/Makefile | |
| parent | 73577d61799e8d8bb7d69a9acdc54923e5998138 (diff) | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
| download | blackbird-op-linux-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.tar.gz blackbird-op-linux-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.zip | |
Merge 4.8-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/virtio/Makefile')
| -rw-r--r-- | drivers/s390/virtio/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/s390/virtio/Makefile b/drivers/s390/virtio/Makefile index 241891a57caf..df40692a9011 100644 --- a/drivers/s390/virtio/Makefile +++ b/drivers/s390/virtio/Makefile @@ -6,4 +6,8 @@ # it under the terms of the GNU General Public License (version 2 only) # as published by the Free Software Foundation. -obj-$(CONFIG_S390_GUEST) += kvm_virtio.o virtio_ccw.o +s390-virtio-objs := virtio_ccw.o +ifdef CONFIG_S390_GUEST_OLD_TRANSPORT +s390-virtio-objs += kvm_virtio.o +endif +obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs) |
