summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/Makefile
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-12-18 09:53:50 +1000
committerDave Airlie <airlied@redhat.com>2009-12-18 09:53:50 +1000
commitcbc8cc049aefd571ebc3c255dc3e265f736751c0 (patch)
tree46626ce409b71790af6220ee0518be694693af99 /drivers/gpu/drm/Makefile
parent5012f5063f41ca01240e5983c3b2cceb9aafc7a4 (diff)
parentfb1d9738ca053ea8afa5e86af6463155f983b01c (diff)
downloadlinux-cbc8cc049aefd571ebc3c255dc3e265f736751c0.tar.bz2
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/Makefile')
-rw-r--r--drivers/gpu/drm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 470ef6779db3..39c5aa75b8f1 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_DRM_I830) += i830/
obj-$(CONFIG_DRM_I915) += i915/
obj-$(CONFIG_DRM_SIS) += sis/
obj-$(CONFIG_DRM_SAVAGE)+= savage/
+obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
obj-$(CONFIG_DRM_VIA) +=via/
obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
obj-y += i2c/