diff options
author | Dave Airlie <airlied@redhat.com> | 2010-07-07 12:38:44 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 12:38:44 +0400 |
commit | 102e73463e1bb921b3a829a1392a29dba16bbabd (patch) | |
tree | 8c569c1a6a7fd3ffc21cf1780bd8fa62be5b23b2 /drivers/gpu/drm/Makefile | |
parent | 5c8d7171cc4984351af802a525675d50ae555a7b (diff) | |
parent | e5510fac98a706c424034950f55bb5e819c46f51 (diff) | |
download | linux-102e73463e1bb921b3a829a1392a29dba16bbabd.tar.xz |
Merge branch 'drm-tracepoints' into drm-testing
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 b4b2b480d0ce..df8f92322865 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -11,7 +11,8 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \ drm_crtc.o drm_modes.o drm_edid.o \ - drm_info.o drm_debugfs.o drm_encoder_slave.o + drm_info.o drm_debugfs.o drm_encoder_slave.o \ + drm_trace_points.o drm-$(CONFIG_COMPAT) += drm_ioc32.o @@ -19,6 +20,8 @@ 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 +CFLAGS_drm_trace_points.o := -I$(src) + obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_TDFX) += tdfx/ |