Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[pandora-kernel.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 1ed9720..825068c 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -36,6 +36,17 @@ config PM_DEBUG
        code. This is helpful when debugging and reporting various PM bugs, 
        like suspend support.
 
+config DISABLE_CONSOLE_SUSPEND
+       bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
+       depends on PM && PM_DEBUG
+       default n
+       ---help---
+       This option turns off the console suspend mechanism that prevents
+       debug messages from reaching the console during the suspend/resume
+       operations.  This may be helpful when debugging device drivers'
+       suspend/resume routines, but may itself lead to problems, for example
+       if netconsole is used.
+
 config PM_TRACE
        bool "Suspend/resume event tracing"
        depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL