From patchwork Tue Nov 20 05:53:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 12969 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 22E2823FCD for ; Tue, 20 Nov 2012 06:00:02 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8DD23A18652 for ; Tue, 20 Nov 2012 06:00:01 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so7691664iej.11 for ; Mon, 19 Nov 2012 22:00:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=KDpQCC7QOO3EDFAZA9tX1d3uEGpH9oaX5xn5oCeUSUY=; b=Tk7ykTLxcQQOtya0Xj+a0RK23akjILzPcJEeNs75ZdmuY+JMAvZ9yLQVZx4h8A4d/d bVJ6mDBdHd1UZxz6Pk8JkHRtBEWodVEwZ/MoJGofxlXrTPsAPrizVg1ZqxDQJlYrrb3F XH6dKaTWkoa5GJ3adi6I54v0t+mKiSfaaiaLm4XWHXw6hWV8m456Iw6ohUMdD2u43UF0 iHBBPNSc/69DGq186BaiHSj6yJ5G9H4ey5WT7gPVFLzKUWdv4ITvix+SUwypS0zSXgwU 5Ml+09fhSYI4igMWl4DOazl5VBmOCrRFxJU09JxMGgYSL+n+uRh1gYUxP+rKM+CWpUE4 wwcg== Received: by 10.50.187.197 with SMTP id fu5mr8806334igc.70.1353391201002; Mon, 19 Nov 2012 22:00:01 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp273700igt; Mon, 19 Nov 2012 22:00:00 -0800 (PST) Received: by 10.69.0.134 with SMTP id ay6mr40145765pbd.50.1353391200494; Mon, 19 Nov 2012 22:00:00 -0800 (PST) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by mx.google.com with ESMTPS id vy7si16821173pbc.216.2012.11.19.22.00.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Nov 2012 22:00:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.53 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.53; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.53 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pa0-f53.google.com with SMTP id hz1so543935pad.26 for ; Mon, 19 Nov 2012 22:00:00 -0800 (PST) Received: by 10.66.87.167 with SMTP id az7mr5111057pab.69.1353391199936; Mon, 19 Nov 2012 21:59:59 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id oi3sm7494128pbb.1.2012.11.19.21.59.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Nov 2012 21:59:59 -0800 (PST) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Cc: bskeggs@redhat.com, airlied@linux.ie, airlied@gmail.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] drm/nouveau: remove duplicate inclusion of nouveau_ttm.h Date: Tue, 20 Nov 2012 11:23:50 +0530 Message-Id: <1353390830-25909-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlMbKWy0WW/RLJMvRShlIvgGwdCeRbBZHyNaUu1xoHPr282TSaU/IdNoD9V9eVJgurZrynn nouveau_ttm.h was included twice. Signed-off-by: Sachin Kamat --- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 0910125..a1e3fed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -49,8 +49,6 @@ #include "nouveau_fbcon.h" #include "nouveau_fence.h" -#include "nouveau_ttm.h" - MODULE_PARM_DESC(config, "option string to pass to driver core"); static char *nouveau_config; module_param_named(config, nouveau_config, charp, 0400);