diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 20:47:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 20:47:42 +0200 |
| commit | 63ca5f1d17a4eecaec3149982223fe89e55a568f (patch) | |
| tree | f8ebd2cf85e5a9850bb628f8b42104772b16ff4e | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz... (diff) | |
| parent | vfio: Include vfio.h in installed headers (diff) | |
| download | linux-63ca5f1d17a4eecaec3149982223fe89e55a568f.tar.xz linux-63ca5f1d17a4eecaec3149982223fe89e55a568f.zip | |
Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
"Just a trivial patch to include vfio.h in the installed headers so we
can complete userspace integration into QEMU."
* tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio:
vfio: Include vfio.h in installed headers
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index d9a754474878..fa217607c582 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -391,6 +391,7 @@ header-y += v4l2-dv-timings.h header-y += v4l2-mediabus.h header-y += v4l2-subdev.h header-y += veth.h +header-y += vfio.h header-y += vhost.h header-y += videodev2.h header-y += virtio_9p.h |