Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-beck.git] / include / linux / console.h

diff --git a/include/linux/console.h b/include/linux/console.h
index 3b709da1786e314bd665da41ae9324567b38313e..29680a8cda9979a1a717d46afb909b900f5e7ab2 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -77,7 +77,9 @@ extern const struct consw prom_con;   /* SPARC PROM console */
 int con_is_bound(const struct consw *csw);
 int register_con_driver(const struct consw *csw, int first, int last);
 int unregister_con_driver(const struct consw *csw);
+int do_unregister_con_driver(const struct consw *csw);
 int take_over_console(const struct consw *sw, int first, int last, int deflt);
+int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
 void give_up_console(const struct consw *sw);
 #ifdef CONFIG_HW_CONSOLE
 int con_debug_enter(struct vc_data *vc);