From patchwork Mon Apr 24 04:50:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97995 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1321358qgf; Sun, 23 Apr 2017 21:56:49 -0700 (PDT) X-Received: by 10.98.112.134 with SMTP id l128mr250607pfc.161.1493009809040; Sun, 23 Apr 2017 21:56:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w10si17554532pgc.273.2017.04.23.21.56.48; Sun, 23 Apr 2017 21:56:49 -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 S1164885AbdDXE4l (ORCPT + 15 others); Mon, 24 Apr 2017 00:56:41 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:48527 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164731AbdDXEvz (ORCPT ); Mon, 24 Apr 2017 00:51:55 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v3O4oqMo025903; Mon, 24 Apr 2017 13:50:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3O4oqMo025903 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1493009460; bh=LVRxE0nG4tNeYDfxW8myF1wDQjXEmNLEf8C/KgU0jYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qakz7LEw7EI/r0LKlNOARdRgd5x0ift4OBL0YR/loF60pOIVGztuOKXQipArD4Ofg xoMwr8tHoPYZpA2ZI2C4DmOx0pJu0/mjYkRMzUd/8XXFpP5v0wpVPKyxxYeNsjwQYT bK70c+/9QepOphWmKnAOb/mPO496HoItsuQUmTF18HwU9beCEb342/MlaKjFlyub5k Cnq3PHKL10ytpNVZxDvcKD57j7E9ay/MnOIE5QsKa27nScKn2yWzoX1KVtFj8X27Ry jQq21Hjx+R1FonDBEGEtubVnPRf527BZHZ2f0Lm52qApZtB/ph3lc88fNpnbv9SZPJ hFtWQX96nQCIQ== 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 v2 11/29] drm/nouveau: fix include notation and remove -Iinclude/drm flag Date: Mon, 24 Apr 2017 13:50:29 +0900 Message-Id: <1493009447-31524-12-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com> References: <1493009447-31524-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 --- Changes in v2: None 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 +- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.7.4 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