lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 237/593] m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 ]

    Since the code for ATARI_KBD_CORE does not use drivers/input/keyboard/
    code, just move ATARI_KBD_CORE to arch/m68k/Kconfig.machine to remove
    the dependency on INPUT_KEYBOARD.

    Removes this kconfig warning:

    WARNING: unmet direct dependencies detected for ATARI_KBD_CORE
    Depends on [n]: !UML && INPUT [=y] && INPUT_KEYBOARD [=n]
    Selected by [y]:
    - MOUSE_ATARI [=y] && !UML && INPUT [=y] && INPUT_MOUSE [=y] && ATARI [=y]

    Fixes: c04cb856e20a ("m68k: Atari keyboard and mouse support.")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Suggested-by: Michael Schmitz <schmitzmic@gmail.com>
    Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Link: https://lore.kernel.org/r/20210527001251.8529-1-rdunlap@infradead.org
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/m68k/Kconfig.machine | 3 +++
    drivers/input/keyboard/Kconfig | 3 ---
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
    index 17e8c3a292d7..e161a4e1493b 100644
    --- a/arch/m68k/Kconfig.machine
    +++ b/arch/m68k/Kconfig.machine
    @@ -23,6 +23,9 @@ config ATARI
    this kernel on an Atari, say Y here and browse the material
    available in <file:Documentation/m68k>; otherwise say N.

    +config ATARI_KBD_CORE
    + bool
    +
    config MAC
    bool "Macintosh support"
    depends on MMU
    diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
    index 793ecbbda32c..9f60f1559e49 100644
    --- a/drivers/input/keyboard/Kconfig
    +++ b/drivers/input/keyboard/Kconfig
    @@ -67,9 +67,6 @@ config KEYBOARD_AMIGA
    To compile this driver as a module, choose M here: the
    module will be called amikbd.

    -config ATARI_KBD_CORE
    - bool
    -
    config KEYBOARD_APPLESPI
    tristate "Apple SPI keyboard and trackpad"
    depends on ACPI && EFI
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:09    [W:4.033 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site