Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio

63ca5f1d · Linus Torvalds <[email protected]> · 2012-08-16 11:47:42 -07:00

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

Commit: 63ca5f1d17a4eecaec3149982223fe89e55a568f
Parents: 2eac9eb8 · 817fea2d

Merge commit. Changes below are compared with the first parent: 2eac9eb8.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
include/linux/Kbuild	modified	+1	−0	View file

include/linux/Kbuild

View file

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index d9a7544..fa21760 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