Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / virtio.h

diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index f508c651e53dec96f7d27a840979fd80a42e0d10..40d1709bdbf4a8b0cc01a7caa132ff0c09c54fda 100644 (file)
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -98,6 +98,7 @@ struct virtio_device {
        void *priv;
 };
 
+#define dev_to_virtio(dev) container_of(dev, struct virtio_device, dev)
 int register_virtio_device(struct virtio_device *dev);
 void unregister_virtio_device(struct virtio_device *dev);