From patchwork Thu Apr 20 09:56:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97751 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp712812qgf; Thu, 20 Apr 2017 03:03:39 -0700 (PDT) X-Received: by 10.98.80.69 with SMTP id e66mr7540771pfb.250.1492682619624; Thu, 20 Apr 2017 03:03:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w19si4799682pgm.237.2017.04.20.03.03.39; Thu, 20 Apr 2017 03:03:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944328AbdDTKDP (ORCPT + 15 others); Thu, 20 Apr 2017 06:03:15 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:57704 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S944265AbdDTJ6f (ORCPT ); Thu, 20 Apr 2017 05:58:35 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id v3K9vLBC027239; Thu, 20 Apr 2017 18:57:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v3K9vLBC027239 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492682252; bh=/y8kphVrD3ztYXyOx5iIWvQ4i/98t8u0qtsH68IXYFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZkG26Lvbjf8PROOvERts9QUa4KVCBR/FmUUHQkASzt0LpcxrCOX0DGOWB8c9NuWb 594Rnjrc+xweVhZhYMrb4IX+lcwDr+ZJ5wJ7S6REjnNH/fHVI2aDFYVlcMMIep0OH8 iZ/R6kbdIZ5+s22ESnB82xpcFLI7zmD1BriRc55AOhU3BbCVAkuEle2ZTz5x7VqcnW SdUsReixiA1r+M3eRCwwQUu8SF9L2n/w4c2kOy+Y6kNqIr9ktyYTS4VzQQrBVOM2Iz MRXFuLyrcIiEaXp+Zer731WUC/9wDde20pxwfBCh+6ltFWFTZJxMp76UBH4jTLkx2D 1+qnJCQvWrGRg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , Jani Nikula , Sean Paul Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 10/28] drm/nouveau: fix include notation and remove -Iinclude/drm flag Date: Thu, 20 Apr 2017 18:56:54 +0900 Message-Id: <1492682232-29769-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492682232-29769-1-git-send-email-yamada.masahiro@socionext.com> References: <1492682232-29769-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Include instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/nouveau/Kbuild | 1 - drivers/gpu/drm/nouveau/nouveau_drm.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index 1c81081..4a5d1b1 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c @@ -18,7 +18,7 @@ #include "msm_drv.h" #include -#include "drm_fb_helper.h" +#include #include "msm_gem.h" extern int msm_gem_mmap_obj(struct drm_gem_object *obj, diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index fde6e36..2e9ce53 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -1,4 +1,3 @@ -ccflags-y := -Iinclude/drm ccflags-y += -I$(src)/include ccflags-y += -I$(src)/include/nvkm ccflags-y += -I$(src)/nvkm diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 2b6ac24..301575c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -29,8 +29,8 @@ #include #include -#include "drmP.h" -#include "drm_crtc_helper.h" +#include +#include #include #include diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index eadec2f..aaa2564 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 13e5cc5..999c35a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -28,7 +28,7 @@ #include "nouveau_ttm.h" #include "nouveau_gem.h" -#include "drm_legacy.h" +#include #include