diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /include/linux/console.h | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 248e6e3b9b73..a67a90cf8268 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty); | |||
| 153 | #define VESA_HSYNC_SUSPEND 2 | 153 | #define VESA_HSYNC_SUSPEND 2 |
| 154 | #define VESA_POWERDOWN 3 | 154 | #define VESA_POWERDOWN 3 |
| 155 | 155 | ||
| 156 | #ifdef CONFIG_VGA_CONSOLE | ||
| 157 | extern bool vgacon_text_force(void); | ||
| 158 | #endif | ||
| 159 | |||
| 156 | #endif /* _LINUX_CONSOLE_H */ | 160 | #endif /* _LINUX_CONSOLE_H */ |