Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1146995pxv; Fri, 9 Jul 2021 19:30:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz60kNzGQOgUhU4jFHt0K4uC4s+UxzzstZwaeInAdtIVEFern/TsrmfdDXZITwTveTNoCBn X-Received: by 2002:a17:906:b201:: with SMTP id p1mr40208976ejz.30.1625884235135; Fri, 09 Jul 2021 19:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884235; cv=none; d=google.com; s=arc-20160816; b=O8vfm8w8jZ2JZjCSJBipWDWWM1HXKk5hng+8YfYbUY9x2B9poydeQInmwVRHhuGOC5 6Nr07cjRcDi5C68deDtqxrl4k5X4kF7DPVbcGNAf4NoUPyGWxVS0qJOC+/A0+boaaYQf yKYwoA6kFiOo/E+l5s2G3vHpL/AuXKhYygISy5ErXkLVE9w3XnhLVS0PrNoJEHA/1QfM qnqq+wtwjXDORglPa+JxrDR/PfgzP1P4ECcDLO8KBoWNZMcBc36GHGR4FpQI9vSIx0XF zenCxCtsKz716kbciEqjP2U3GafxZp2wdOGhr0SEmql+bDm/sAsq9fJqRALKJ1YERgn8 XfGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4rRciInVBBVokLtSCVrEqeREev+kj0kw8/jVOXKUhZk=; b=w0ULgGFxwedtVoC9LHjAxXEPgWEO8j/LKdsQSeTxmuObDeYBOBFU0XT3D8g0h74N/Y gsrW8f8rpRQ4Rya0G8TjLIpxmFeNrD+JNqQViKc+6SjFa+fO09lTu+gXxxYJVJn76sEV Cl4lLHV0eVGDfvjbaPj9XEHknW5/KLHdqMQudATRZjgpws6knrwYl7lgM3POE3yI0LAo zn2L5rASXytNfp4r+7tz6nICqK3ZSCzGVA/JP+2UeNHeCPxkjd8p42Ic3f9aEW02mAaY oLNjIpPIXqTt1Kl/FfKXGuDV/DtsDzC0EcU5nJalEu/osG9OEONboZbnQM0ez/nwUBR7 MgJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lbIdeQ06; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h13si8985979ede.66.2021.07.09.19.30.12; Fri, 09 Jul 2021 19:30:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lbIdeQ06; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232735AbhGJCcI (ORCPT + 99 others); Fri, 9 Jul 2021 22:32:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:43180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234133AbhGJC3N (ORCPT ); Fri, 9 Jul 2021 22:29:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 446E5613E8; Sat, 10 Jul 2021 02:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883929; bh=Nr5gL9JOSKUjbA100HeDI/KrMsIKYBDVkr9sctcPrpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lbIdeQ06T+zT93xNqyI5xFHkDYEqEOGV8sKgH3guvGVDeLkpm3lEs33ZimO72JIlX UYdPjPgnrWOfsLwX0zEMo/bZp8z6uj2bN9BSXw5/aOU5trL5/qtEqQWb2/52Yu6wNa Ec6x24qF5ZRfOuGMizRUg7x6BSXAwY9n2wKMZrQz6SzpHRsMyeixhW3Lyc4SF4xs7+ DP/UMXOmAC7lMXZdcIG904y9Vh5fCq8EfRDuSGX5nfJdkswtv3aeWnG8ny13RwEp+J L/OHcbxbZ0x6cWe2o05RUslqlGmDkk2Ud6C7FvE2JE0/IO8g659cUdX6KBgf8FndKK fuSevkTNCLcoA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eli Billauer , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 5.10 46/93] char: xillybus: Fix condition for invoking the xillybus/ subdirectory Date: Fri, 9 Jul 2021 22:23:40 -0400 Message-Id: <20210710022428.3169839-46-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022428.3169839-1-sashal@kernel.org> References: <20210710022428.3169839-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eli Billauer [ Upstream commit 1b1ee3a91d21fdf7d415c1060db1a7a07ae296b6 ] As Xillybus' configuration symbol hierarchy has been reorganized recently, the correct condition for compiling the xillybus/ subdirectory is now CONFIG_XILLYBUS_CLASS, and not CONFIG_XILLYBUS. Reported-by: Greg Kroah-Hartman Signed-off-by: Eli Billauer Link: https://lore.kernel.org/r/20210528092242.51104-1-eli.billauer@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/char/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/Makefile b/drivers/char/Makefile index ffce287ef415..c7e4fc733a37 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -44,6 +44,6 @@ obj-$(CONFIG_TCG_TPM) += tpm/ obj-$(CONFIG_PS3_FLASH) += ps3flash.o -obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o -- 2.30.2