summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 16:15:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 16:15:12 -0700
commitce06ea8339de1dca3455e9c89c56ea161988ab71 (patch)
treeef6e12f96bbe0c78e6cd0ad1fc6fc679b80808e0
parent17879857821adad4e180c5d6457c3b8bbf1d0c0c (diff)
parent9261ec1a8d7b17e2540bef7cad3470870d13b61e (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: console: Fix compilation regression
-rw-r--r--include/linux/console.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h
index f76fc297322d..95cf6f08a59d 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -79,8 +79,13 @@ int register_con_driver(const struct consw *csw, int first, int last);
int unregister_con_driver(const struct consw *csw);
int 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);
int con_debug_leave(void);
+#else
+#define con_debug_enter(vc) (0)
+#define con_debug_leave() (0)
+#endif
/* scroll */
#define SM_UP (1)