diff options
| author | Stefan Hajnoczi | 2015-12-09 03:51:12 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-09 03:55:49 +0100 |
| commit | 8ac2837c89c8c0fcad557e4380aeef80580390f9 (patch) | |
| tree | 9fc34a91680351c4bb706a663516b7e79c44978d /net/vmw_vsock/Makefile | |
| parent | Merge branch 'sh_eth-optimize-mdio' (diff) | |
| download | kernel-qcow2-linux-8ac2837c89c8c0fcad557e4380aeef80580390f9.tar.gz kernel-qcow2-linux-8ac2837c89c8c0fcad557e4380aeef80580390f9.tar.xz kernel-qcow2-linux-8ac2837c89c8c0fcad557e4380aeef80580390f9.zip | |
Revert "Merge branch 'vsock-virtio'"
This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421 and merge
commit c402293bd76fbc93e52ef8c0947ab81eea3ae019, reversing changes made
to c89359a42e2a49656451569c382eed63e781153c.
The virtio-vsock device specification is not finalized yet. Michael
Tsirkin voiced concerned about merging this code when the hardware
interface (and possibly the userspace interface) could still change.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock/Makefile')
| -rw-r--r-- | net/vmw_vsock/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/vmw_vsock/Makefile b/net/vmw_vsock/Makefile index cf4c29439081..2ce52d70f224 100644 --- a/net/vmw_vsock/Makefile +++ b/net/vmw_vsock/Makefile @@ -1,7 +1,5 @@ obj-$(CONFIG_VSOCKETS) += vsock.o obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o -obj-$(CONFIG_VIRTIO_VSOCKETS) += virtio_transport.o -obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += virtio_transport_common.o vsock-y += af_vsock.o vsock_addr.o |