projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
Makefile
diff --git
a/drivers/gpu/drm/Makefile
b/drivers/gpu/drm/Makefile
index 470ef6779db33d11e2bcbc60610f8671c34d10ef..39c5aa75b8f119eb6cc3263e44bc592ef25b9f30 100644
(file)
--- 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/