lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 77/83] x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
    Date
    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

    \
     
     \ /
      Last update: 2021-10-11 16:00    [W:4.016 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site