releases/4.14.53/auxdisplay-fix-broken-menu.patch

   1 From b5b903fba96a4d1771422efd5c713ebb73f7dc82 Mon Sep 17 00:00:00 2001
   2 From: Randy Dunlap <rdunlap@infradead.org>
   3 Date: Wed, 28 Feb 2018 18:33:03 -0800
   4 Subject: auxdisplay: fix broken menu
   5
   6 From: Randy Dunlap <rdunlap@infradead.org>
   7
   8 commit b5b903fba96a4d1771422efd5c713ebb73f7dc82 upstream.
   9
  10 Having the CHARLCD Kconfig symbol between "menuconfig AUXDISPLAY"
  11 and "if AUXDISPLAY" breaks the AUXDISPLAY submenus, so move the
  12 CHARLCD Kconfig symbol near the end of the file so that the menu
  13 display is continuous.
  14
  15 Also include ARM_CHARLCD inside of the if AUXDISPLAY/endif block.
  16 Geert says that it should be there.
  17
  18 Fixes: 39f8ea46724e ("auxdisplay: charlcd: Extract character LCD core from misc/panel")
  19
  20 Cc: stable@vger.kernel.org # v4.12
  21 Cc: Geert Uytterhoeven <geert@linux-m68k.org>
  22 Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
  23 Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
  24 Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26
  27 ---
  28  drivers/auxdisplay/Kconfig |   10 +++++-----
  29  1 file changed, 5 insertions(+), 5 deletions(-)
  30
  31 --- a/drivers/auxdisplay/Kconfig
  32 +++ b/drivers/auxdisplay/Kconfig
  33 @@ -14,9 +14,6 @@ menuconfig AUXDISPLAY
  34
  35           If you say N, all options in this submenu will be skipped and disabled.
  36
  37 -config CHARLCD
  38 -       tristate "Character LCD core support" if COMPILE_TEST
  39 -
  40  if AUXDISPLAY
  41
  42  config HD44780
  43 @@ -157,8 +154,6 @@ config HT16K33
  44           Say yes here to add support for Holtek HT16K33, RAM mapping 16*8
  45           LED controller driver with keyscan.
  46
  47 -endif # AUXDISPLAY
  48 -
  49  config ARM_CHARLCD
  50         bool "ARM Ltd. Character LCD Driver"
  51         depends on PLAT_VERSATILE
  52 @@ -169,6 +164,8 @@ config ARM_CHARLCD
  53           line and the Linux version on the second line, but that's
  54           still useful.
  55
  56 +endif # AUXDISPLAY
  57 +
  58  config PANEL
  59         tristate "Parallel port LCD/Keypad Panel support"
  60         depends on PARPORT
  61 @@ -448,3 +445,6 @@ config PANEL_BOOT_MESSAGE
  62           printf()-formatted message is valid with newline and escape codes.
  63
  64  endif # PANEL
  65 +
  66 +config CHARLCD
  67 +       tristate "Character LCD core support" if COMPILE_TEST