From patchwork Wed Apr 21 21:07:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Clifton X-Patchwork-Id: 93949 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3LL7HAO005993 for ; Wed, 21 Apr 2010 21:07:53 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B1959E758; Wed, 21 Apr 2010 14:07:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ppsw-43.csi.cam.ac.uk (ppsw-43.csi.cam.ac.uk [131.111.8.143]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DF709E73F for ; Wed, 21 Apr 2010 14:07:14 -0700 (PDT) X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg11-0-0-cust151.cmbg.cable.ntl.com ([86.22.72.152]:39792 helo=[192.168.1.4]) by ppsw-43.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.156]:465) with esmtpsa (LOGIN:pcjc2) (SSLv3:DHE-RSA-AES256-SHA:256) id 1O4h8b-000192-Di (Exim 4.70) for intel-gfx@lists.freedesktop.org (return-path ); Wed, 21 Apr 2010 22:07:13 +0100 From: Peter Clifton To: intel-gfx@lists.freedesktop.org Date: Wed, 21 Apr 2010 22:07:12 +0100 Message-ID: <1271884032.20195.1.camel@pcjc2lap> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Subject: [Intel-gfx] [PATCH] Fix out of tree builds broken by i915/i915_trace_points.c X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 21:07:53 +0000 (UTC) From 63dab13a63c57be8a76ac1f01bbee66230eb1659 Mon Sep 17 00:00:00 2001 From: Peter Clifton 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(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 9929f84..9563901 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 01840d9..5498b37 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -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 -- 1.7.0.4