diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 12:05:47 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 12:05:47 -0500 |
| commit | a05ba4561fa3ad8b64a27577d0d38c190f60f762 (patch) | |
| tree | 5eb7561113e006b7bad0bef50dec6821962b1b36 /include/linux/vt_kern.h | |
| parent | 74293759002aa7db0179158c20676a034614577b (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
Merge branch 'master' of /home/aia21/ntfs-2.6/
Diffstat (limited to 'include/linux/vt_kern.h')
| -rw-r--r-- | include/linux/vt_kern.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index fab5aed8ca31..530ae3f4248c 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -73,6 +73,11 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); | |||
| 73 | int vt_waitactive(int vt); | 73 | int vt_waitactive(int vt); |
| 74 | void change_console(struct vc_data *new_vc); | 74 | void change_console(struct vc_data *new_vc); |
| 75 | void reset_vc(struct vc_data *vc); | 75 | void reset_vc(struct vc_data *vc); |
| 76 | #ifdef CONFIG_VT | ||
| 77 | int is_console_suspend_safe(void); | ||
| 78 | #else | ||
| 79 | static inline int is_console_suspend_safe(void) { return 1; } | ||
| 80 | #endif | ||
| 76 | 81 | ||
| 77 | /* | 82 | /* |
| 78 | * vc_screen.c shares this temporary buffer with the console write code so that | 83 | * vc_screen.c shares this temporary buffer with the console write code so that |