diff options
| author | Bartlomiej Zolnierkiewicz <[email protected]> | 2018-06-28 15:41:55 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <[email protected]> | 2018-06-28 15:41:55 +0200 |
| commit | d725d6e3290bad6af3b8c60eaffc1663bc163910 (patch) | |
| tree | 8539ca6adfd8778e9c73111e23770adc7b04beb2 /include/linux | |
| parent | 6b16f5d12202a23d875915349cc031c07fe1b3ec (diff) | |
| parent | 83d83bebf40132e2d55ec58af666713cc76f9764 (diff) | |
Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into fbdev-for-next
Immutable branch between fbdev and drm for the v4.19 merge window
(contains the deferred console takeover feature)
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/console.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index dfd6b0e97855..f59f3dbca65c 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -21,6 +21,7 @@ struct console_font_op; struct console_font; struct module; struct tty_struct; +struct notifier_block; /* * this is what the terminal answers to a ESC-Z or csi0c query. @@ -220,4 +221,8 @@ static inline bool vgacon_text_force(void) { return false; } extern void console_init(void); +/* For deferred console takeover */ +void dummycon_register_output_notifier(struct notifier_block *nb); +void dummycon_unregister_output_notifier(struct notifier_block *nb); + #endif /* _LINUX_CONSOLE_H */ |