| Message ID | 20210527001251.8529-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 |
| Headers | show |
| Series | [v2] MOUSE_ATARI: fix kconfig unmet dependency warning | expand |
On Thu, May 27, 2021 at 2:12 AM Randy Dunlap <rdunlap@infradead.org> wrote: > 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 > this dependency. > > 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> > Cc: Michael Schmitz <schmitz@debian.org> > Cc: Roman Zippel <zippel@linux-m68k.org> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: linux-input@vger.kernel.org > Cc: linux-m68k@lists.linux-m68k.org > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > Suggested-by: Michael Schmitz <schmitzmic@gmail.com> > --- > v2: move the symbol outside of INPUT_KEYBOARD (Geert) -- all the way > to Kconfig.machine (Michael). Thanks. Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> I'm willing to queue this in the m68k for-v5.14 branch, if Dmitry agrees. Gr{oetje,eeting}s, Geert
On Thu, May 27, 2021 at 08:56:30AM +0200, Geert Uytterhoeven wrote: > On Thu, May 27, 2021 at 2:12 AM Randy Dunlap <rdunlap@infradead.org> wrote: > > 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 > > this dependency. > > > > 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> > > Cc: Michael Schmitz <schmitz@debian.org> > > Cc: Roman Zippel <zippel@linux-m68k.org> > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Cc: linux-input@vger.kernel.org > > Cc: linux-m68k@lists.linux-m68k.org > > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > > Suggested-by: Michael Schmitz <schmitzmic@gmail.com> > > > --- > > v2: move the symbol outside of INPUT_KEYBOARD (Geert) -- all the way > > to Kconfig.machine (Michael). Thanks. > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > I'm willing to queue this in the m68k for-v5.14 branch, if Dmitry agrees. Sure, works for me. Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Thanks.
Hi Dmitry, On Wed, Jun 2, 2021 at 6:15 AM Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > On Thu, May 27, 2021 at 08:56:30AM +0200, Geert Uytterhoeven wrote: > > On Thu, May 27, 2021 at 2:12 AM Randy Dunlap <rdunlap@infradead.org> wrote: > > > 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 > > > this dependency. > > > > > > 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> > > > Cc: Michael Schmitz <schmitz@debian.org> > > > Cc: Roman Zippel <zippel@linux-m68k.org> > > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > > Cc: linux-input@vger.kernel.org > > > Cc: linux-m68k@lists.linux-m68k.org > > > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > > > Suggested-by: Michael Schmitz <schmitzmic@gmail.com> > > > > > --- > > > v2: move the symbol outside of INPUT_KEYBOARD (Geert) -- all the way > > > to Kconfig.machine (Michael). Thanks. > > > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > > > I'm willing to queue this in the m68k for-v5.14 branch, if Dmitry agrees. > > Sure, works for me. > > Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Thanks, queue in the m68k for-v5.14 branch. Gr{oetje,eeting}s, Geert
--- linux-next-20210525.orig/arch/m68k/Kconfig.machine +++ linux-next-20210525/arch/m68k/Kconfig.machine @@ -25,6 +25,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 --- linux-next-20210525.orig/drivers/input/keyboard/Kconfig +++ linux-next-20210525/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
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 this dependency. 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> Cc: Michael Schmitz <schmitz@debian.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-input@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> Suggested-by: Michael Schmitz <schmitzmic@gmail.com> --- v2: move the symbol outside of INPUT_KEYBOARD (Geert) -- all the way to Kconfig.machine (Michael). Thanks. arch/m68k/Kconfig.machine | 3 +++ drivers/input/keyboard/Kconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)