Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1143290pxv; Fri, 9 Jul 2021 19:22:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2UUBrBniIdPl3aEVkZoLFISFoQDfrRAzqNkZlo/wLGeGYhnd7o1GPrBjX5Z7tKUtAoA/+ X-Received: by 2002:a17:907:968a:: with SMTP id hd10mr29482973ejc.393.1625883759916; Fri, 09 Jul 2021 19:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625883759; cv=none; d=google.com; s=arc-20160816; b=QHYl2ZhZAyHMV8oP32vp8FaUtUaCP8AlkGDhVAyiQeCuZcN29uregvs3mkb1VfR1S7 7AGvE9mb/e4HTTYaPNq6NZ5UI6U+dW9m0v5rf+otpC8ve4RhGS/R2ewJo0x4zJ7lUpL3 rUoEHGYPgA+/TusmKViRFH1r7Fa7yU2Otjri7j/SqqjJrwKkBgOms8Q0ckEZKKHnxprz RPer87mTwx88ut/mJKePgTL/LtzPi9RZ1NoK4dGCg2MkjAEI2+kj4fO8nyflr9NzfDjK G8HrpWQQN4nU2XX0OokLXR6vyi/gUauOsPNRyMsSQtrxLGKvQfOyeKebaxQBXecmKir7 f1gg== 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=L8btcXUNUAplkaQkvN0YRZvNUYXOulcFz3CWq5TONJAafgyeGqqqNA+zwvdr1dD8IS uIgd/xOVTnyy/CwYzchQoYVTG+ZHWM1nzSKmUGNNjjOXZnVZ9J4cc0qOEFRbUlwIUXNX WjPo8trPDNiMIawFaGO6pz2uihgzD38l+g6VOwy7cK0IieBlrQvB8w0svDNkbhKNzftm ikkKVJasfJ29EcNM2CKrOizgdLfzmOYeMr9eWpWRcWVLbrJRBWMozZ1+OtKkatqZcGz1 zXu5Am5fSRcc3E/A4TYz0VOCb4ZmfbPEtn6lXYWJcuucsUmBsxdQBYf1oCUhKoIO4tmS yXnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kh5BglNz; 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 dm19si8738750ejc.143.2021.07.09.19.22.16; Fri, 09 Jul 2021 19:22:39 -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=kh5BglNz; 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 S232986AbhGJCWh (ORCPT + 99 others); Fri, 9 Jul 2021 22:22:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:38792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232618AbhGJCVs (ORCPT ); Fri, 9 Jul 2021 22:21:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 65DAB6140C; Sat, 10 Jul 2021 02:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883541; bh=Nr5gL9JOSKUjbA100HeDI/KrMsIKYBDVkr9sctcPrpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kh5BglNz1Sfyz09cI9sX/YXvw36xr8Ai9W05f0TCazSuK6tKNyRdbh/ZowacT9ZVM NDHQkE3+LhUZjquQdNavK4OAi01SwTVnTUJpvRIym1mqJTAHW2/wtfK7uZce3MnE7A oGmGmhfIyhwkW6fPZpBTKfP7QPHXs9e4KCaKgT/AWZrFfBTmLoeLsL9zgkBR7+fwvn 8jytE4cvzQwfEftQrbP4sm8SVAWwcryKoYT8Fk8ybacLHwfiSmZ2gwQWA8UT5XyClX Qb0PvEPfkVtD/tbZnYkcGbDZb3jTpRSgd2YtONiVSo7AigFAtqX6bHLnuaDOoQ2+wh DBqoLdh2nKvtQ== 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.13 053/114] char: xillybus: Fix condition for invoking the xillybus/ subdirectory Date: Fri, 9 Jul 2021 22:16:47 -0400 Message-Id: <20210710021748.3167666-53-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710021748.3167666-1-sashal@kernel.org> References: <20210710021748.3167666-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