diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-17 18:53:50 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-17 18:53:50 -0500 |
| commit | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (patch) | |
| tree | 46626ce409b71790af6220ee0518be694693af99 /drivers/gpu/drm/Makefile | |
| parent | 5012f5063f41ca01240e5983c3b2cceb9aafc7a4 (diff) | |
| parent | fb1d9738ca053ea8afa5e86af6463155f983b01c (diff) | |
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 |
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/ | |||
| 30 | obj-$(CONFIG_DRM_I915) += i915/ | 30 | obj-$(CONFIG_DRM_I915) += i915/ |
| 31 | obj-$(CONFIG_DRM_SIS) += sis/ | 31 | obj-$(CONFIG_DRM_SIS) += sis/ |
| 32 | obj-$(CONFIG_DRM_SAVAGE)+= savage/ | 32 | obj-$(CONFIG_DRM_SAVAGE)+= savage/ |
| 33 | obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ | ||
| 33 | obj-$(CONFIG_DRM_VIA) +=via/ | 34 | obj-$(CONFIG_DRM_VIA) +=via/ |
| 34 | obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ | 35 | obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ |
| 35 | obj-y += i2c/ | 36 | obj-y += i2c/ |