summaryrefslogtreecommitdiff
path: root/include/linux/vt_kern.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-27 05:57:53 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-27 05:57:53 +0400
commit8095e4e81b4bc38eef7e0be99f9ecc744eaa1683 (patch)
treed3b5100db11784093e78513f3429022569b4bf7b /include/linux/vt_kern.h
parent6b5f146535fe6969aeded9f00b0bc42b3783f7fd (diff)
parente4aa937ec75df0eea0bee03bffa3303ad36c986b (diff)
downloadlinux-8095e4e81b4bc38eef7e0be99f9ecc744eaa1683.tar.xz
Merge 3.10-rc3 into tty-next
We want these fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/vt_kern.h')
-rw-r--r--include/linux/vt_kern.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index adc7ff58befc..8d7634247fb4 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -36,7 +36,7 @@ extern int fg_console, last_console, want_console;
int vc_allocate(unsigned int console);
int vc_cons_allocated(unsigned int console);
int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines);
-void vc_deallocate(unsigned int console);
+struct vc_data *vc_deallocate(unsigned int console);
void reset_palette(struct vc_data *vc);
void do_blank_screen(int entering_gfx);
void do_unblank_screen(int leaving_gfx);