diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /include/linux/vt_kern.h | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'include/linux/vt_kern.h')
| -rw-r--r-- | include/linux/vt_kern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 1c78d56c57e5..1cbd0a7db4e6 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -35,7 +35,6 @@ extern int fg_console, last_console, want_console; | |||
| 35 | int vc_allocate(unsigned int console); | 35 | int vc_allocate(unsigned int console); |
| 36 | int vc_cons_allocated(unsigned int console); | 36 | int vc_cons_allocated(unsigned int console); |
| 37 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); | 37 | int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); |
| 38 | int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines); | ||
| 39 | void vc_deallocate(unsigned int console); | 38 | void vc_deallocate(unsigned int console); |
| 40 | void reset_palette(struct vc_data *vc); | 39 | void reset_palette(struct vc_data *vc); |
| 41 | void do_blank_screen(int entering_gfx); | 40 | void do_blank_screen(int entering_gfx); |