| From 4758fd801f919b8b9acad78d2e49a195ec2be46b Mon Sep 17 00:00:00 2001 |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Date: Tue, 3 Aug 2021 13:35:24 +0200 |
| Subject: x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI |
| |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| |
| commit 4758fd801f919b8b9acad78d2e49a195ec2be46b upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/platform/olpc/olpc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_driv |
| |
| 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 |