summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Clifton <pcjc2@cam.ac.uk>2010-05-03 14:24:41 +0200
committerEric Anholt <eric@anholt.net>2010-05-10 22:38:32 +0200
commita7c542782e92f9487c62a571565637be3d6b0ffd (patch)
treee2851c21c7a9802dff67319db628dc319f19f7c2
parentdrm/i915: move fence lru to struct drm_i915_fence_reg (diff)
downloadlinux-a7c542782e92f9487c62a571565637be3d6b0ffd.tar.xz
linux-a7c542782e92f9487c62a571565637be3d6b0ffd.zip
drm/i915: Fix out of tree builds
Fixes up include paths for i915_trace.h by setting additional CFLAGS for i915_trace_points.c to include the $src directory. The required TRACE_INCLUDE_PATH is then "." Signed-off-by: Peter Clifton <pcjc2@cam.ac.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/Makefile2
-rw-r--r--drivers/gpu/drm/i915/i915_trace.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 9929f84ec3e1..95639017bdbe 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -33,3 +33,5 @@ i915-$(CONFIG_ACPI) += i915_opregion.o
i915-$(CONFIG_COMPAT) += i915_ioc32.o
obj-$(CONFIG_DRM_I915) += i915.o
+
+CFLAGS_i915_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 303815321c79..9e4c45f68d6e 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -276,5 +276,5 @@ DEFINE_EVENT(i915_ring, i915_ring_wait_end,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/i915
+#define TRACE_INCLUDE_PATH .
#include <trace/define_trace.h>