diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-06-01 11:15:16 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-06-01 11:15:16 +0300 |
| commit | d053cf0d771f6547cb0537759a9af63cf402908d (patch) | |
| tree | df61806e45c6cf7e9cdd0b271f959f0962f8623e /include/linux/console.h | |
| parent | 6a0af9fc8ccef5304ef88dc7e27362732e047076 (diff) | |
| parent | eb012d125a2419786f5bcaaf8a901babc7b6e3d7 (diff) | |
| download | linux-d053cf0d771f6547cb0537759a9af63cf402908d.tar.xz | |
Merge branch 'for-5.8' into for-linus
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 72141f71c014..75dd20650fbe 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -101,7 +101,6 @@ extern const struct consw *conswitchp; extern const struct consw dummy_con; /* dummy console buffer */ extern const struct consw vga_con; /* VGA text console */ extern const struct consw newport_con; /* SGI Newport console */ -extern const struct consw prom_con; /* SPARC PROM console */ int con_is_bound(const struct consw *csw); int do_unregister_con_driver(const struct consw *csw); @@ -149,6 +148,7 @@ struct console { struct tty_driver *(*device)(struct console *, int *); void (*unblank)(void); int (*setup)(struct console *, char *); + int (*exit)(struct console *); int (*match)(struct console *, char *name, int idx, char *options); short flags; short index; @@ -201,7 +201,6 @@ extern void suspend_console(void); extern void resume_console(void); int mda_console_init(void); -void prom_con_init(void); void vcs_make_sysfs(int index); void vcs_remove_sysfs(int index); |