diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:36:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:36:43 -0800 |
| commit | 9ca4c6429f92598a84e4c3292ea7d187c9d7b033 (patch) | |
| tree | cfee3dec5dd6643de99969245ac83a82aa65ef42 /include | |
| parent | 11f2534bae8c9dc6dace2018226733e4899a57c3 (diff) | |
| parent | d68712ee35069455ea4043d443c8d4fb9a1ee956 (diff) | |
| download | linux-9ca4c6429f92598a84e4c3292ea7d187c9d7b033.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller: 1) Add a proper .exit.data section. 2) Fix ipc64_perm type definition, from Arnd Bergmann. 3) Support folded p4d page tables on sparc64, from Mike Rapport. 4) Remove uses of struct timex, also from Arnd Bergmann. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: y2038: sparc: remove use of struct timex sparc64: add support for folded p4d page tables sparc/console: kill off obsolete declarations sparc32: fix struct ipc64_perm type definition sparc32, leon: Stop adding vendor and device id to prom ambapp path components sparc: Add .exit.data section. sparc: remove unneeded uapi/asm/statfs.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index d09951d5a94e..f33016b3a401 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); @@ -201,7 +200,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); |