From patchwork Thu Aug 14 12:17:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ruprecht X-Patchwork-Id: 4731041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 07032C0338 for ; Sun, 17 Aug 2014 11:38:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ADC620120 for ; Sun, 17 Aug 2014 11:38:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CE88F20123 for ; Sun, 17 Aug 2014 11:38:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3F526E303; Sun, 17 Aug 2014 04:38:34 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by gabe.freedesktop.org (Postfix) with ESMTP id A27886E196 for ; Thu, 14 Aug 2014 05:17:08 -0700 (PDT) Received: by mail-lb0-f175.google.com with SMTP id 10so919287lbg.34 for ; Thu, 14 Aug 2014 05:17:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VH6mKI723zWEQ3O8kY9SVBi9sQi75kSrqFS4gsKn9kY=; b=KUCAQuYcfF14hclAn1XYFA7Gzc9k79iTn4nKN7ohowp7Ds5lWTajTEpkDdMxGXfGBX iORUCkci9z4NkuHLybd4QMuiKHSnGtfwHgIDNGFe7JKp/FRTlHFdHXw6kF/uxoEQdwM7 q4D55Or0oNRIcZf4om9YRnh3+KGwM2OdLmoGhCSniHBV3QRut27SA4F+dn2uFQX43kyD KV6dCobxuK+iiw17VfeIv1JUkncpk8jH9RWdjQZbmB0NUnzcIgjkFI4N7ViyBCFmtO88 m4hhl3m05C2sVfFdptZAQ+WcxLswGvlIRf2JhvUbkqyje/3GLUPkJ42/l3QMz6scpmG/ UPoQ== X-Gm-Message-State: ALoCoQkr2cqisjVXdfGGZeWJBp5NoSEfZeE4AXeC610AUcc/FhTEgaADmmp3ZJSC9o3HpuJK4P6J X-Received: by 10.112.106.67 with SMTP id gs3mr4593159lbb.84.1408018627092; Thu, 14 Aug 2014 05:17:07 -0700 (PDT) Received: from faui49t.informatik.uni-erlangen.de (faui49t.informatik.uni-erlangen.de. [131.188.42.17]) by mx.google.com with ESMTPSA id kv3sm7672555lbc.37.2014.08.14.05.17.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Aug 2014 05:17:06 -0700 (PDT) From: Andreas Ruprecht To: David Airlie Subject: [PATCH] drm/radeon: Remove duplicate include from Makefile Date: Thu, 14 Aug 2014 14:17:17 +0200 Message-Id: <1408018637-28415-1-git-send-email-rupran@einserver.de> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Sun, 17 Aug 2014 04:38:33 -0700 Cc: Alex Deucher , Andreas Ruprecht , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the Makefile, radeon_uvd.o is added to radeon-y twice. As it belongs to the UVD block marked with a comment, the other include from the block of includes labelled as "KMS driver" is deleted. Signed-off-by: Andreas Ruprecht --- drivers/gpu/drm/radeon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 0013ad0..f77b713 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -76,7 +76,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ evergreen.o evergreen_cs.o evergreen_blit_shaders.o \ evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \ atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \ - si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \ + si_blit_shaders.o radeon_prime.o cik.o cik_blit_shaders.o \ r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \ rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \ trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \