From patchwork Thu Oct 1 06:48:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7305101 Return-Path: X-Original-To: patchwork-linux-kbuild@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 45B7FBF90C for ; Thu, 1 Oct 2015 06:45:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A36320421 for ; Thu, 1 Oct 2015 06:45:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 461592041B for ; Thu, 1 Oct 2015 06:45:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750932AbbJAGpt (ORCPT ); Thu, 1 Oct 2015 02:45:49 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:36787 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791AbbJAGps (ORCPT ); Thu, 1 Oct 2015 02:45:48 -0400 Received: by wicgb1 with SMTP id gb1so14102860wic.1 for ; Wed, 30 Sep 2015 23:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=o5OspHPy19y3TdsWWbUMfJ5enC96d4K4KpKNEkzPjgs=; b=W1oWGwew4876oRJ6tfbhaX1Nr8VX0SjAOrIP30WAiZt4KSd+K2MMmgaENFH2eypS1e YXdIvvj54mh458yz1IYdo8u01GbaSdf9pisixyheCwUI5A5aluZbgdZ/K1dxdJkUHtqG Oz5jz/15+9u/Rkx2mSwVVxMGmmW4eooK6cSBw= 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:mime-version :content-type:content-transfer-encoding; bh=o5OspHPy19y3TdsWWbUMfJ5enC96d4K4KpKNEkzPjgs=; b=U8TBL3QwxMt3wsmMTwA5k+4OFDWQL3NSd1zRDBrnqwKwUVsKyDo6YHgrs5VnE6ypHE D+3151qsc1+SkcGPA7Yw+nBnZG0atP6Dm2oCIpDvvyF/tbmfmTdzA38iwkz33edu84V3 B5auhzNzLa0uEbf/gSJEzGwII1JUiggrO10XjLMDEE/Tamjqc1to4Epr1bkW468T8GGM kQi4uuaVmcyFZ7kAkvbBrvS3K0RmBYXig7u/D7zJCscD3RKsT2Fip86OJV5GNs4lAS3H fBxiRZV1yIc2exF2zBqIG3Mw3+BoeIYrqz8HCobfx0jbZbEfRYxuPl/Z3uXDXjghbYPo yhNw== X-Gm-Message-State: ALoCoQl3IDUIeL6j4Nr5VxBdWfzu9iWPIlZV1Qh94yfzkEOnYLJBExbix2OXBW+/daA639x4kW2m X-Received: by 10.180.188.169 with SMTP id gb9mr1560604wic.72.1443681947374; Wed, 30 Sep 2015 23:45:47 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pb4sm4454486wjb.8.2015.09.30.23.45.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Sep 2015 23:45:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: Daniel Vetter , Stephen Rothwell , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Michal Marek , linux-kbuild@vger.kernel.org, Daniel Vetter Subject: [PATCH] drm: Hack around CONFIG_AGP=m build failures Date: Thu, 1 Oct 2015 08:48:39 +0200 Message-Id: <1443682119-17011-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Surprisingly kbuild can't cope with tristates in the -$(CONFIG_FOO) pattern. This patch hacks up a solution. Reported-by: Stephen Rothwell Reported-by: Ville Syrjälä Cc: Stephen Rothwell Cc: Ville Syrjälä Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org Signed-off-by: Daniel Vetter Tested-by: Ville Syrjälä --- drivers/gpu/drm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index f458d6e33655..e814517513ce 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -21,6 +21,8 @@ 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