[NETFILTER]: x_tables: add RATEEST target

[pandora-kernel.git] / include / linux / console.h

diff --git a/include/linux/console.h b/include/linux/console.h
index 56a7bcd..a5f88a6 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -45,7 +45,8 @@ struct consw {
        int     (*con_font_get)(struct vc_data *, struct console_font *);
        int     (*con_font_default)(struct vc_data *, struct console_font *, char *);
        int     (*con_font_copy)(struct vc_data *, int);
-       int     (*con_resize)(struct vc_data *, unsigned int, unsigned int);
+       int     (*con_resize)(struct vc_data *, unsigned int, unsigned int,
+                              unsigned int);
        int     (*con_set_palette)(struct vc_data *, unsigned char *);
        int     (*con_scrolldelta)(struct vc_data *, int);
        int     (*con_set_origin)(struct vc_data *);
@@ -121,14 +122,11 @@ extern void console_stop(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
 
-#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
+extern int console_suspend_enabled;
+
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
 extern void resume_console(void);
-#else
-static inline void suspend_console(void) {}
-static inline void resume_console(void) {}
-#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 
 int mda_console_init(void);
 void prom_con_init(void);