Patched in Tegra support.

1 files changed, 3 insertions, 9 deletions

diff --git a/include/linux/console.h b/include/linux/console.h
index dedb082fe50..7453cfd593c 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -83,14 +83,8 @@ void give_up_console(const struct consw *sw);
 int con_debug_enter(struct vc_data *vc);
 int con_debug_leave(void);
 #else
-static inline int con_debug_enter(struct vc_data *vc)
-{
-        return 0;
-}
-static inline int con_debug_leave(void)
-{
-        return 0;
-}
+#define con_debug_enter(vc) (0)
+#define con_debug_leave() (0)
 #endif
 
 /* scroll */
@@ -158,7 +152,7 @@ extern int braille_register_console(struct console *, int index,
                 char *console_options, char *braille_options);
 extern int braille_unregister_console(struct console *);
 extern void console_sysfs_notify(void);
-extern bool console_suspend_enabled;
+extern int console_suspend_enabled;
 
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);