From patchwork Wed Oct 28 13:25:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 7512941 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 318B7BEEA4 for ; Wed, 28 Oct 2015 14:57:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74D1520859 for ; Wed, 28 Oct 2015 14:57:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A897720818 for ; Wed, 28 Oct 2015 14:57:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 992666E22F; Wed, 28 Oct 2015 07:57:30 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 624566E8B7 for ; Wed, 28 Oct 2015 06:25:59 -0700 (PDT) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3DB0AACB1; Wed, 28 Oct 2015 13:26:14 +0000 (UTC) Received: by pobox.suse.cz (Postfix, from userid 10020) id 29C00C22A4; Wed, 28 Oct 2015 14:25:57 +0100 (CET) From: Michal Marek To: linux-kbuild@vger.kernel.org Subject: [PATCH 3/3] Revert "drm: Hack around CONFIG_AGP=m build failures" Date: Wed, 28 Oct 2015 14:25:42 +0100 Message-Id: <1446038742-13482-3-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1446038742-13482-1-git-send-email-mmarek@suse.cz> References: <1446038742-13482-1-git-send-email-mmarek@suse.cz> X-Mailman-Approved-At: Wed, 28 Oct 2015 07:57:28 -0700 Cc: daniel.vetter@ffwll.ch, Michal Marek , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.2 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 From: Michal Marek Kbuild now supports -m variables. This reverts commit 8fa884dc355ffd0caa964a284a530bf747df5c77. Cc: dri-devel@lists.freedesktop.org Signed-off-by: Michal Marek --- drivers/gpu/drm/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index e814517..f458d6e 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -21,8 +21,6 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o drm-$(CONFIG_OF) += drm_of.o drm-$(CONFIG_AGP) += drm_agpsupport.o -drm-y += $(drm-m) - drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o