* [PATCH] fix i915 compile in 2.6.36-rc2
@ 2010-08-23 10:38 Meelis Roos
2010-08-23 11:23 ` Chris Wilson
2010-08-30 22:03 ` Eric Anholt
0 siblings, 2 replies; 3+ messages in thread
From: Meelis Roos @ 2010-08-23 10:38 UTC (permalink / raw)
To: Chris Wilson, Eric Anholt, David Airlie; +Cc: Linux Kernel list, dri-devel
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 <mroos@linux.ee>
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 (mroos@linux.ee)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix i915 compile in 2.6.36-rc2
2010-08-23 10:38 [PATCH] fix i915 compile in 2.6.36-rc2 Meelis Roos
@ 2010-08-23 11:23 ` Chris Wilson
2010-08-30 22:03 ` Eric Anholt
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2010-08-23 11:23 UTC (permalink / raw)
To: Meelis Roos, Eric Anholt, David Airlie; +Cc: Linux Kernel list, dri-devel
On Mon, 23 Aug 2010 13:38:27 +0300 (EEST), Meelis Roos <mroos@linux.ee> 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 <mroos@linux.ee>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix i915 compile in 2.6.36-rc2
2010-08-23 10:38 [PATCH] fix i915 compile in 2.6.36-rc2 Meelis Roos
2010-08-23 11:23 ` Chris Wilson
@ 2010-08-30 22:03 ` Eric Anholt
1 sibling, 0 replies; 3+ messages in thread
From: Eric Anholt @ 2010-08-30 22:03 UTC (permalink / raw)
To: Meelis Roos, Chris Wilson, David Airlie; +Cc: Linux Kernel list, dri-devel
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
On Mon, 23 Aug 2010 13:38:27 +0300 (EEST), Meelis Roos <mroos@linux.ee> 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 <mroos@linux.ee>
Applied. Thanks!
(sorry for the delay on this, guys. I swear someone had sent one of
these to Linus directly, and every time that happens and I apply it
anyway, he's already pulled it. So I've been off in userland work
instead).
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-30 22:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-23 10:38 [PATCH] fix i915 compile in 2.6.36-rc2 Meelis Roos
2010-08-23 11:23 ` Chris Wilson
2010-08-30 22:03 ` Eric Anholt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®