diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/console.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 7453cfd593c8..7201ce4280ca 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -152,7 +152,7 @@ extern int braille_register_console(struct console *, int index, | |||
| 152 | char *console_options, char *braille_options); | 152 | char *console_options, char *braille_options); |
| 153 | extern int braille_unregister_console(struct console *); | 153 | extern int braille_unregister_console(struct console *); |
| 154 | extern void console_sysfs_notify(void); | 154 | extern void console_sysfs_notify(void); |
| 155 | extern int console_suspend_enabled; | 155 | extern bool console_suspend_enabled; |
| 156 | 156 | ||
| 157 | /* Suspend and resume console messages over PM events */ | 157 | /* Suspend and resume console messages over PM events */ |
| 158 | extern void suspend_console(void); | 158 | extern void suspend_console(void); |