Fix out of tree builds broken by i915/i915_trace_points.c

Patch attached.

Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA

Tel: +44 (0)7729 980173 - (No signal in the lab!)
Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)

From: Peter Clifton <[email protected]>
Date: Wed, 21 Apr 2010 22:03:21 +0100
Subject: [PATCH] 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 "."

---
 drivers/gpu/drm/i915/Makefile     |    2 ++
 drivers/gpu/drm/i915/i915_trace.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

index 9929f84..9563901 100644
@@ -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)

index 01840d9..5498b37 100644
@@ -312,5 +312,5 @@ TRACE_EVENT(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>

1.7.0.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Please include a Signed-off-by indicating agreement with Documentation/SubmittingPatches: so I can apply it to the kernel. Also, git send-email instead of attachments makes it so I don't have to hand-edit your commit messages after applying :)

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx