From: Dave Airlie <airlied@redhat.com>
Date: Wed, 7 Jul 2010 08:38:44 +0000 (+1000)
Subject: Merge branch 'drm-tracepoints' into drm-testing
X-Git-Tag: v2.6.36-rc1~540^2~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=102e73463e1bb921b3a829a1392a29dba16bbabd;p=~shefty%2Frdma-dev.git

Merge branch 'drm-tracepoints' into drm-testing
---

102e73463e1bb921b3a829a1392a29dba16bbabd
diff --cc drivers/gpu/drm/Makefile
index b4b2b480d0c,3b02e04ec2c..df8f9232286
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -9,9 -9,10 +9,10 @@@ drm-y       :=	drm_auth.o drm_buffer.o 
  		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
  		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
  		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 -		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.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