diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:15:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:15:12 -0700 |
| commit | ce06ea8339de1dca3455e9c89c56ea161988ab71 (patch) | |
| tree | ef6e12f96bbe0c78e6cd0ad1fc6fc679b80808e0 /include/linux | |
| parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | console: Fix compilation regression (diff) | |
| download | linux-dev-ce06ea8339de1dca3455e9c89c56ea161988ab71.tar.xz linux-dev-ce06ea8339de1dca3455e9c89c56ea161988ab71.zip | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/console.h | 5 |
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) |