LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "tip-bot2 for Lukas Bulwahn" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>,
Borislav Petkov <bp@suse.de>, <stable@vger.kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
Date: Tue, 05 Oct 2021 22:52:34 -0000 [thread overview]
Message-ID: <163347435478.25758.5867182553865653470.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210803113531.30720-3-lukas.bulwahn@gmail.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 4f90c68790aaa260fb5852406c28e25018872e45
Gitweb: https://git.kernel.org/tip/4f90c68790aaa260fb5852406c28e25018872e45
Author: Lukas Bulwahn <lukas.bulwahn@gmail.com>
AuthorDate: Tue, 03 Aug 2021 13:35:24 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 06 Oct 2021 00:46:10 +02:00
x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
The refactoring in the commit in Fixes introduced an ifdef
CONFIG_OLPC_XO1_5_SCI, however the config symbol is actually called
"CONFIG_OLPC_XO15_SCI".
Fortunately, ./scripts/checkkconfigsymbols.py warns:
OLPC_XO1_5_SCI
Referencing files: arch/x86/platform/olpc/olpc.c
Correct this ifdef condition to the intended config symbol.
Fixes: ec9964b48033 ("Platform: OLPC: Move EC-specific functionality out from x86")
Suggested-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20210803113531.30720-3-lukas.bulwahn@gmail.com
---
arch/x86/platform/olpc/olpc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c
index ee2beda..1d4a00e 100644
--- a/arch/x86/platform/olpc/olpc.c
+++ b/arch/x86/platform/olpc/olpc.c
@@ -274,7 +274,7 @@ static struct olpc_ec_driver ec_xo1_driver = {
static struct olpc_ec_driver ec_xo1_5_driver = {
.ec_cmd = olpc_xo1_ec_cmd,
-#ifdef CONFIG_OLPC_XO1_5_SCI
+#ifdef CONFIG_OLPC_XO15_SCI
/*
* XO-1.5 EC wakeups are available when olpc-xo15-sci driver is
* compiled in
next prev parent reply other threads:[~2021-10-05 22:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 11:35 [PATCH 0/9] Kconfig symbol clean-up on ./arch/x86/ Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 1/9] x86/entry: correct reference to intended CONFIG_64_BIT Lukas Bulwahn
2021-10-05 10:32 ` [tip: x86/urgent] x86/entry: Correct " tip-bot2 for Lukas Bulwahn
2021-10-06 17:38 ` tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 2/9] x86, olpc: correct condition to intended CONFIG_OLPC_XO15_SCI Lukas Bulwahn
2021-10-05 22:52 ` tip-bot2 for Lukas Bulwahn [this message]
2021-10-06 17:38 ` [tip: x86/urgent] x86/platform/olpc: Correct ifdef symbol " tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 3/9] x86/Kconfig: correct reference to MWINCHIP3D Lukas Bulwahn
2021-10-05 22:52 ` [tip: x86/urgent] x86/Kconfig: Correct " tip-bot2 for Lukas Bulwahn
2021-10-06 17:38 ` tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 4/9] x86/Kconfig: remove reference to obsolete MFD_INTEL_MSIC config Lukas Bulwahn
2021-10-06 14:06 ` [tip: x86/cleanups] x86/Kconfig: Remove references to obsolete Kconfig symbols tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 5/9] x86/Kconfig: remove reference to obsolete APB_TIMER config Lukas Bulwahn
2021-10-05 19:57 ` Borislav Petkov
2021-08-03 11:35 ` [PATCH 6/9] x86/irq: fix slightly wrong reference in comment Lukas Bulwahn
2021-10-06 14:06 ` [tip: x86/cleanups] x86: Fix misspelled Kconfig symbols tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 7/9] x86/uaccess: adjust comment for endif of CONFIG_CC_HAS_ASM_GOTO_OUTPUT Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 8/9] x86: page_32.h: adjust comment for endif of CONFIG_X86_USE_3DNOW Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 9/9] x86: ia32.h: adjust comment for endif of CONFIG_IA32_EMULATION Lukas Bulwahn
2021-10-05 19:59 ` Borislav Petkov
2021-08-03 14:32 ` [PATCH 0/9] Kconfig symbol clean-up on ./arch/x86/ Dave Hansen
2021-08-03 15:12 ` Lukas Bulwahn
2021-08-03 15:40 ` Dave Hansen
2021-12-22 13:00 ` Lukas Bulwahn
2021-08-03 21:49 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163347435478.25758.5867182553865653470.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=rdunlap@infradead.org \
--cc=stable@vger.kernel.org \
--cc=x86@kernel.org \
--subject='Re: [tip: x86/urgent] x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).