diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /include/linux/virtio.h | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'include/linux/virtio.h')
| -rw-r--r-- | include/linux/virtio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/virtio.h b/include/linux/virtio.h index f508c651e53d..40d1709bdbf4 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h | |||
| @@ -98,6 +98,7 @@ struct virtio_device { | |||
| 98 | void *priv; | 98 | void *priv; |
| 99 | }; | 99 | }; |
| 100 | 100 | ||
| 101 | #define dev_to_virtio(dev) container_of(dev, struct virtio_device, dev) | ||
| 101 | int register_virtio_device(struct virtio_device *dev); | 102 | int register_virtio_device(struct virtio_device *dev); |
| 102 | void unregister_virtio_device(struct virtio_device *dev); | 103 | void unregister_virtio_device(struct virtio_device *dev); |
| 103 | 104 | ||