diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 10:42:53 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 10:42:53 +0900 |
commit | 4993632218e2202d4f110c8e83ae819ca26e6845 (patch) | |
tree | 0872195b8c09b03d54adaaaf4304d1285091b031 /drivers/vhost/vringh.c | |
parent | 1c4e2d70afb132058bfe979f6854c1d0a732b556 (diff) | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
download | op-kernel-dev-4993632218e2202d4f110c8e83ae819ca26e6845.zip op-kernel-dev-4993632218e2202d4f110c8e83ae819ca26e6845.tar.gz |
Merge 3.10-rc3 into driver-core-next
We want the changes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vhost/vringh.c')
-rw-r--r-- | drivers/vhost/vringh.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index bff0775..5174eba 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -3,6 +3,7 @@ * * Since these may be in userspace, we use (inline) accessors. */ +#include <linux/module.h> #include <linux/vringh.h> #include <linux/virtio_ring.h> #include <linux/kernel.h> @@ -1005,3 +1006,5 @@ int vringh_need_notify_kern(struct vringh *vrh) return __vringh_need_notify(vrh, getu16_kern); } EXPORT_SYMBOL(vringh_need_notify_kern); + +MODULE_LICENSE("GPL"); |