2010-08-23 10:38:30

by Meelis Roos

[permalink] [raw]
Subject: [PATCH] fix i915 compile in 2.6.36-rc2

Commit 6ef3d4278034982c13df87c4a51e0445f762d316 introduces seq_file
usage in intel_overlay.c but does not include the header and now
compilation fails on i386. Fix it by including the necessary header.

Signed-off-by: Meelis Roos <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 4f00390..7e4b378 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -25,6 +25,7 @@
*
* Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
*/
+#include <linux/seq_file.h>
#include "drmP.h"
#include "drm.h"
#include "i915_drm.h"

--
Meelis Roos ([email protected])


2010-08-23 11:23:17

by Chris Wilson

[permalink] [raw]
Subject: Re: [PATCH] fix i915 compile in 2.6.36-rc2

On Mon, 23 Aug 2010 13:38:27 +0300 (EEST), Meelis Roos <[email protected]> wrote:
> Commit 6ef3d4278034982c13df87c4a51e0445f762d316 introduces seq_file
> usage in intel_overlay.c but does not include the header and now
> compilation fails on i386. Fix it by including the necessary header.
>
> Signed-off-by: Meelis Roos <[email protected]>
Acked-by: Chris Wilson <[email protected]>

I have a pending patch to compile out this code when DEBUG_FS is not used
which is the root cause of the compilation failure. That is a little more
invasive than this simple patch...

--
Chris Wilson, Intel Open Source Technology Centre