Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 889cad07774e82d82ba1e47b6b51bdab8eeebf00..78d928f9d9f1abaa3c3a0b46e7deb69cd9f65a16 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 && !64BIT
+       depends on SERIAL_NONSTANDARD
        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
@@ -805,10 +805,6 @@ 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