From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66DA6C07E99 for ; Sat, 10 Jul 2021 02:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38ADB613F7 for ; Sat, 10 Jul 2021 02:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231938AbhGJC0t (ORCPT ); Fri, 9 Jul 2021 22:26:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:42484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233151AbhGJCZt (ORCPT ); Fri, 9 Jul 2021 22:25:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 15B186140C; Sat, 10 Jul 2021 02:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883781; bh=Nr5gL9JOSKUjbA100HeDI/KrMsIKYBDVkr9sctcPrpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NwvGeZM2Kwb0vZSLF9gytrFWDkapKmohXxNrRboQCy8UTNzhNFzYA04zXK90bjYk8 0m9O/jddVEvGmSNwIr6fjqz+BWKi1/weN8nXF4wU5RdPcg0eij5XdNq25LiQTWZdh/ S9pOabVGpLWwaezTZIkAeoe/C45AZ66+6ACIgLZeNOPeM18h8zHM3hvSFSyajK/uKX e1vmsLeyMv8zd0qvSAfJBtQ4kkuCGS+IByOr+R51Ww1LJ6L39GIKVl0ZW8hA/TWtwP ZjfAIngNnUJ4aZXul9Txekqs53S5U+lIP+Z34vAOgKnsm/KPBP0k96mYxxkT21eQHA 9Oin3L6OJHs6w== 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.12 049/104] char: xillybus: Fix condition for invoking the xillybus/ subdirectory Date: Fri, 9 Jul 2021 22:21:01 -0400 Message-Id: <20210710022156.3168825-49-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022156.3168825-1-sashal@kernel.org> References: <20210710022156.3168825-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