Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3141dd3..f09fc0e 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -276,11 +276,19 @@ config N_HDLC
          Allows synchronous HDLC communications with tty device drivers that
          support synchronous HDLC such as the Microgate SyncLink adapter.
 
          Allows synchronous HDLC communications with tty device drivers that
          support synchronous HDLC such as the Microgate SyncLink adapter.
 

-         This driver can only be built as a module ( = code which can be
+         This driver can be built as a module ( = code which can be

          inserted in and removed from the running kernel whenever you want).
          The module will be called n_hdlc. If you want to do that, say M
          here.
 
          inserted in and removed from the running kernel whenever you want).
          The module will be called n_hdlc. If you want to do that, say M
          here.
 

+config N_GSM
+       tristate "GSM MUX line discipline support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       depends on NET
+       help
+         This line discipline provides support for the GSM MUX protocol and
+         presents the mux as a set of 61 individual tty devices.
+

 config RISCOM8
        tristate "SDL RISCom/8 card support"
        depends on SERIAL_NONSTANDARD
 config RISCOM8
        tristate "SDL RISCom/8 card support"
        depends on SERIAL_NONSTANDARD


@@ -1113,5 +1121,12 @@ config DEVPORT
 
 source "drivers/s390/char/Kconfig"
 
 
 source "drivers/s390/char/Kconfig"
 

+config RAMOOPS
+       tristate "Log panic/oops to a RAM buffer"
+       default n
+       help
+         This enables panic and oops messages to be logged to a circular
+         buffer in RAM where it can be read back at some later point.
+

 endmenu
 
 endmenu