diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
| commit | 193cb93e5a5f32c0520eed17e87135d20594d1e1 (patch) | |
| tree | 3b5584f4e5e73f5f01807e5176cbe29e1db69868 /drivers/gpu/drm/Makefile | |
| parent | 23e707dd9b0b26215d801c59e87feed1c218a0f9 (diff) | |
| parent | f42ecb2808db5386f983d593a7c08d3ea3b94a27 (diff) | |
| download | kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.gz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.xz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.zip | |
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 3c8827a7aab..39c5aa75b8f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -15,7 +15,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ drm-$(CONFIG_COMPAT) += drm_ioc32.o -drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o +drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o @@ -30,4 +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/ |