summaryrefslogtreecommitdiff
path: root/tools/virtio/linux/virtio.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-10-06 10:56:43 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2016-10-06 10:56:43 +0300
commit301a36fa700f9add6e14f5a95c7573e01578343a (patch)
tree6ff94ff3b08b838353b9127eb5f8055b3de6b25f /tools/virtio/linux/virtio.h
parentb828f960215f02e5d2c88bbd27565c694254a15a (diff)
parentb60752f2b20c167859943e001727f0d4da419b23 (diff)
downloadlinux-301a36fa700f9add6e14f5a95c7573e01578343a.tar.xz
Merge branches 'misc' and 'sa1111-base' into for-linus
Diffstat (limited to 'tools/virtio/linux/virtio.h')
-rw-r--r--tools/virtio/linux/virtio.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index ee125e714053..9377c8b4ac16 100644
--- a/tools/virtio/linux/virtio.h
+++ b/tools/virtio/linux/virtio.h
@@ -3,8 +3,12 @@
#include <linux/scatterlist.h>
#include <linux/kernel.h>
+struct device {
+ void *parent;
+};
+
struct virtio_device {
- void *dev;
+ struct device dev;
u64 features;
};