auxdisplay: fix broken menu

commit b5b903fba96a4d1771422efd5c713ebb73f7dc82 upstream.

Having the CHARLCD Kconfig symbol between "menuconfig AUXDISPLAY"
and "if AUXDISPLAY" breaks the AUXDISPLAY submenus, so move the
CHARLCD Kconfig symbol near the end of the file so that the menu
display is continuous.

Also include ARM_CHARLCD inside of the if AUXDISPLAY/endif block.
Geert says that it should be there.

Fixes: 39f8ea46724e ("auxdisplay: charlcd: Extract character LCD core from misc/panel")
Cc: stable@vger.kernel.org # v4.12
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 2c2ed9cf879626692706bdf86f447cb4d8c05c26..f9413755177babf1c5f6a5c5663483314cbea2d3 100644 (file)
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -14,9 +14,6 @@ menuconfig AUXDISPLAY
 
          If you say N, all options in this submenu will be skipped and disabled.
 
-config CHARLCD
-       tristate "Character LCD core support" if COMPILE_TEST
-
 if AUXDISPLAY
 
 config HD44780
@@ -157,8 +154,6 @@ config HT16K33
          Say yes here to add support for Holtek HT16K33, RAM mapping 16*8
          LED controller driver with keyscan.
 
-endif # AUXDISPLAY
-
 config ARM_CHARLCD
        bool "ARM Ltd. Character LCD Driver"
        depends on PLAT_VERSATILE
@@ -169,6 +164,8 @@ config ARM_CHARLCD
          line and the Linux version on the second line, but that's
          still useful.
 
+endif # AUXDISPLAY
+
 config PANEL
        tristate "Parallel port LCD/Keypad Panel support"
        depends on PARPORT
@@ -448,3 +445,6 @@ config PANEL_BOOT_MESSAGE
          printf()-formatted message is valid with newline and escape codes.
 
 endif # PANEL
+
+config CHARLCD
+       tristate "Character LCD core support" if COMPILE_TEST