1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index be8371ac3086..f01ac9a07bf5 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -194,17 +194,6 @@ config MOXA_INTELLIO
           module will be called moxa.
 
 config MOXA_SMARTIO
-        tristate "Moxa SmartIO support (OBSOLETE)"
-        depends on SERIAL_NONSTANDARD
-        help
-          Say Y here if you have a Moxa SmartIO multiport serial card.
-
-          This driver can also 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 mxser. If you want to do that, say M
-          here.
-
-config MOXA_SMARTIO_NEW
         tristate "Moxa SmartIO support v. 2.0"
         depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
         help
@@ -215,7 +204,7 @@ config MOXA_SMARTIO_NEW
           changes finally resulting in PCI probing.
 
           This driver can also be built as a module. The module will be called
-          mxser_new. If you want to do that, say M here.
+          mxser. If you want to do that, say M here.
 
 config ISI
         tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
@@ -276,7 +265,7 @@ config N_HDLC
 
 config RISCOM8
         tristate "SDL RISCom/8 card support"
-        depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+        depends on SERIAL_NONSTANDARD
         help
           This is a driver for the SDL Communications RISCom/8 multiport card,
           which gives you many serial ports. You would need something like
@@ -765,7 +754,7 @@ config JS_RTC
 
 config SGI_DS1286
         tristate "SGI DS1286 RTC support"
-        depends on SGI_IP22
+        depends on SGI_HAS_DS1286
         help
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you