summaryrefslogtreecommitdiffstats
path: root/include/drm/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 13:19:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 13:19:31 -0800
commit5fa3577b1a1202972e6e419040438c29f39f59cc (patch)
treef148c5bfad584ba8ac79d43fd3e40a12d49d92af /include/drm/Kbuild
parentd4220f987cf473c65a342ca69e3eb13dea919a49 (diff)
parentfb1d9738ca053ea8afa5e86af6463155f983b01c (diff)
downloadlinux-stable-5fa3577b1a1202972e6e419040438c29f39f59cc.tar.gz
linux-stable-5fa3577b1a1202972e6e419040438c29f39f59cc.tar.bz2
linux-stable-5fa3577b1a1202972e6e419040438c29f39f59cc.zip
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/vmwgfx: Add DRM driver for VMware Virtual GPU drm/vmwgfx: Add svga headers for vmwgfx driver drm/ttm: Add more driver type enums
Diffstat (limited to 'include/drm/Kbuild')
-rw-r--r--include/drm/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
index cfa6af43c9ea..bd3a1c2fbdb4 100644
--- a/include/drm/Kbuild
+++ b/include/drm/Kbuild
@@ -7,5 +7,6 @@ unifdef-y += r128_drm.h
unifdef-y += radeon_drm.h
unifdef-y += sis_drm.h
unifdef-y += savage_drm.h
+unifdef-y += vmwgfx_drm.h
unifdef-y += via_drm.h
unifdef-y += nouveau_drm.h