linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c736273..8b72a61 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -291,7 +291,7 @@ config SX
 
 config RIO
        tristate "Specialix RIO system support"
-       depends on SERIAL_NONSTANDARD
+       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && !64BIT
        help
          This is a driver for the Specialix RIO, a smart serial card which
          drives an outboard box that can support up to 128 ports.  Product
@@ -464,8 +464,6 @@ config LEGACY_PTYS
          security.  This option enables these legacy devices; on most
          systems, it is safe to say N.
 
-config CRASH
-        tristate "Crash Utility memory driver"
 
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
@@ -563,31 +561,14 @@ config TIPAR
 
          If unsure, say N.
 
-config HVC_DRIVER
-       bool
-       help
-         Users of pSeries machines that want to utilize the hvc console front-end
-         module for their backend console driver should select this option.
-         It will automatically be selected if one of the back-end console drivers
-         is selected.
-
-
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
-       select HVC_DRIVER
        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
 
-config HVC_RTAS
-       bool "IBM RTAS Console support"
-       depends on PPC_RTAS
-       select HVC_DRIVER
-       help
-         IBM Console device driver which makes use of RTAS
-
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
@@ -715,7 +696,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
+       depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV
        ---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
@@ -807,6 +788,10 @@ config S3C2410_RTC
          Samsung S3C2410. This can provide periodic interrupt rates
          from 1Hz to 64Hz for user programs, and wakeup from Alarm.
 
+config RTC_VR41XX
+       tristate "NEC VR4100 series Real Time Clock Support"
+       depends on CPU_VR41XX
+
 config COBALT_LCD
        bool "Support for Cobalt LCD"
        depends on MIPS_COBALT