On Thu, Mar 1, 2018 at 4:33 AM, Randy Dunlap <[email protected]> wrote: > From: Randy Dunlap <[email protected]> > > 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: [email protected] # v4.12 > Cc: Geert Uytterhoeven <[email protected]> > Cc: Andy Shevchenko <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]> > Cc: Miguel Ojeda Sandonis <[email protected]> > Signed-off-by: Randy Dunlap <[email protected]> > --- > drivers/auxdisplay/Kconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > --- linux-next-20180228.orig/drivers/auxdisplay/Kconfig > +++ linux-next-20180228/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 > > -- With Best Regards, Andy Shevchenko
