Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[deliverable/linux.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7cfcc629a7fd0f89bf56995652aff7d888379549..43d3395325c57fe28a72954512384787b66ad8f3 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -493,6 +493,21 @@ config LEGACY_PTY_COUNT
          When not in use, each legacy PTY occupies 12 bytes on 32-bit
          architectures and 24 bytes on 64-bit architectures.
 
+config TTY_PRINTK
+       bool "TTY driver to output user messages via printk"
+       depends on EMBEDDED
+       default n
+       ---help---
+         If you say Y here, the support for writing user messages (i.e.
+         console messages) via printk is available.
+
+         The feature is useful to inline user messages with kernel
+         messages.
+         In order to use this feature, you should output user messages
+         to /dev/ttyprintk or redirect console to this TTY.
+
+         If unsure, say N.
+
 config BRIQ_PANEL
        tristate 'Total Impact briQ front panel driver'
        depends on PPC_CHRP
@@ -1002,7 +1017,7 @@ config SCx200_GPIO
 
 config PC8736x_GPIO
        tristate "NatSemi PC8736x GPIO Support"
-       depends on X86
+       depends on X86_32
        default SCx200_GPIO     # mostly N
        select NSC_GPIO         # needed for support routines
        help