diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:26:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:28:19 +0200 |
| commit | 5e1249ff36d29653dde09fedf1d04a4ecff028c2 (patch) | |
| tree | 900c8f019139e9be4d4fe403cbe67d4dfd487f92 /include/uapi/linux/Kbuild | |
| parent | a2ee48d60eed9cfb6447a4233370aee4ea88108b (diff) | |
| parent | fe4c63c8cbd22251f8ce8bcb7853e46385f7af82 (diff) | |
Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
Pull in patches Jani applied while I was on vacation.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1a0006a76b00..4460e5820b0e 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -430,6 +430,7 @@ header-y += virtio_balloon.h header-y += virtio_blk.h header-y += virtio_config.h header-y += virtio_console.h +header-y += virtio_gpu.h header-y += virtio_ids.h header-y += virtio_input.h header-y += virtio_net.h |