diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /include/linux/vt_kern.h | |
parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/vt_kern.h')
-rw-r--r-- | include/linux/vt_kern.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 530ae3f4248..fab5aed8ca3 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -73,11 +73,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); int vt_waitactive(int vt); void change_console(struct vc_data *new_vc); void reset_vc(struct vc_data *vc); -#ifdef CONFIG_VT -int is_console_suspend_safe(void); -#else -static inline int is_console_suspend_safe(void) { return 1; } -#endif /* * vc_screen.c shares this temporary buffer with the console write code so that |