I think maybe we should remove both of the two lines: 

#include "intel_drv.h"

#include "i915_drv.h"

Because we have two "intel_drv.h" and one "i915_drv.h", and 

"i915_drv.h" has already been included in the "intel_drv.h".

I not sure whether i am right. If you need me to do the patch,

let me know.

On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <daniel@ffwll.ch> wrote:

On Thu, Apr 16, 2015 at 09:11:08PM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Remove duplicated include.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_audio.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 2396cc7..d00d488 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -28,7 +28,6 @@
>
>  #include <drm/drmP.h>
>  #include <drm/drm_edid.h>
> -#include "intel_drv.h"
>  #include "i915_drv.h"
>
>  /**
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch