diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-15 09:20:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-15 09:20:17 -0700 |
| commit | 329120423947e8b36fd2f8b5cf69944405d0aece (patch) | |
| tree | cb7b405d40847026052b2af9bfb1fcc6a1d44d55 /drivers/auxdisplay/Kconfig | |
| parent | 2b245b8b033a90c6373400a29ec93a8713601eff (diff) | |
| parent | 6c4d6bc5486466e3a67cc47270001d0b4a26eed4 (diff) | |
Merge tag 'auxdisplay-for-linus-v5.3-rc5' of git://github.com/ojeda/linux
Pull auxdisplay fixes from Miguel Ojeda:
"A few minor auxdisplay improvements:
- A couple of small header cleanups for charlcd (Masahiro Yamada)
- A trivial typo fix for the examples of cfag12864b (Masahiro Yamada)
- An Kconfig help text improvement for charlcd (Mans Rullgard)
- An error path fix for panel (zhengbin)"
* tag 'auxdisplay-for-linus-v5.3-rc5' of git://github.com/ojeda/linux:
auxdisplay: Fix a typo in cfag12864b-example.c
auxdisplay: charlcd: add include guard to charlcd.h
auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay
auxdisplay: charlcd: add help text for backlight initial state
auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
Diffstat (limited to 'drivers/auxdisplay/Kconfig')
| -rw-r--r-- | drivers/auxdisplay/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index dd61fdd400f0..68489d1f00bb 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -448,6 +448,11 @@ config PANEL_BOOT_MESSAGE choice prompt "Backlight initial state" default CHARLCD_BL_FLASH + ---help--- + Select the initial backlight state on boot or module load. + + Previously, there was no option for this: the backlight flashed + briefly on init. Now you can also turn it off/on. config CHARLCD_BL_OFF bool "Off" |