summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-16 11:47:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-16 11:47:42 -0700
commit63ca5f1d17a4eecaec3149982223fe89e55a568f (patch)
treef8ebd2cf85e5a9850bb628f8b42104772b16ff4e /include
parent2eac9eb8a2e64cbfcc300e9a8098edf424c1d16c (diff)
parent817fea2df3c24b22f6123dc0106eb063b7132883 (diff)
downloadlinux-stable-63ca5f1d17a4eecaec3149982223fe89e55a568f.tar.gz
linux-stable-63ca5f1d17a4eecaec3149982223fe89e55a568f.tar.bz2
linux-stable-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
Diffstat (limited to 'include')
-rw-r--r--include/linux/Kbuild1
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