redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

auxdisplay: fix broken menu 

commit b5b903fba9 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: 39f8ea4672 ("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>
pull/10/head
Randy Dunlap 2018-02-28 18:33:03 -08:00 committed by Greg Kroah-Hartman
parent 226ffbf613
commit 9e838b2e5a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/auxdisplay/Kconfig
View File

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