diff options
| author |   Mike Marshall <hubcap@omnibond.com> | 2017-01-27 13:33:25 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2017-01-27 13:33:25 -0500 |
| commit | a1f817dc8ed79cdff2b76bc51d545fb9465982be (patch) | |
| tree | 2c92b9b7cdf3b0efb3b9ce33cd6f84ef4d54a1a7 /include/linux/console.h | |
| parent | orangefs: Axe some dead code (diff) | |
| parent | Linux 4.9 (diff) | |
Merge tag 'v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next
Linux 4.9
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 3672809234a7..d530c4627e54 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -173,12 +173,6 @@ static inline void console_sysfs_notify(void) #endif extern bool console_suspend_enabled; -#ifdef CONFIG_OF -extern void console_set_by_of(void); -#else -static inline void console_set_by_of(void) {} -#endif - /* Suspend and resume console messages over PM events */ extern void suspend_console(void); extern void resume_console(void); |