Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[~andy/linux] / include / linux / vt_kern.h

diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 530ae3f4248ccb6afb3dfe84cee7c1264e32ca38..940d0261a5459078c7283597e63f97c1c2337aa0 100644 (file)
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -6,7 +6,6 @@
  * with information needed by the vt package
  */
 
-#include <linux/config.h>
 #include <linux/vt.h>
 #include <linux/kd.h>
 #include <linux/tty.h>
@@ -73,11 +72,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