2012-02-15 17:54:15

by Danny Kukawka

Subject: [PATCH] Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"

This reverts commit e167976ee7f5fe4b80f7e8f55e087f6c67cf9562,
Since this was already fixed in commit
3bd3c9329973a93fa3ef5e9840f2fd6fa2889e3f some days before this
commit cause seq_file.h to be included twice.

Signed-off-by: Danny Kukawka <[email protected]>
---
drivers/gpu/drm/i915/intel_overlay.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index cdf17d4..134c42a 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -25,8 +25,6 @@
*
* 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"
--
1.7.8.3

2012-02-16 09:58:21

by Daniel Vetter

Subject: Re: [PATCH] Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"

On Wed, Feb 15, 2012 at 06:53:55PM +0100, Danny Kukawka wrote:
> This reverts commit e167976ee7f5fe4b80f7e8f55e087f6c67cf9562,
> Since this was already fixed in commit
> 3bd3c9329973a93fa3ef5e9840f2fd6fa2889e3f some days before this
> commit cause seq_file.h to be included twice.
>
> Signed-off-by: Danny Kukawka <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48