diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/virtio/linux/virtio.h | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/virtio/linux/virtio.h')
| -rw-r--r-- | tools/virtio/linux/virtio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h index cd801838156f..844783040703 100644 --- a/tools/virtio/linux/virtio.h +++ b/tools/virtio/linux/virtio.h | |||
| @@ -45,9 +45,6 @@ struct virtqueue { | |||
| 45 | void *priv; | 45 | void *priv; |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | #define MODULE_LICENSE(__MODULE_LICENSE_value) \ | ||
| 49 | const char *__MODULE_LICENSE_name = __MODULE_LICENSE_value | ||
| 50 | |||
| 51 | /* Interfaces exported by virtio_ring. */ | 48 | /* Interfaces exported by virtio_ring. */ |
| 52 | int virtqueue_add_sgs(struct virtqueue *vq, | 49 | int virtqueue_add_sgs(struct virtqueue *vq, |
| 53 | struct scatterlist *sgs[], | 50 | struct scatterlist *sgs[], |