vserver 1.9.5.x5

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f7bfe20..e2579ef 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -192,7 +192,7 @@ config MOXA_INTELLIO
 
 config MOXA_SMARTIO
        tristate "Moxa SmartIO support"
-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD
        help
          Say Y here if you have a Moxa SmartIO multiport serial card.
 
@@ -203,7 +203,7 @@ config MOXA_SMARTIO
 
 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-       depends on SERIAL_NONSTANDARD && PCI && EXPERIMENTAL && BROKEN_ON_SMP && m
+       depends on SERIAL_NONSTANDARD
        help
          This is a driver for the Multi-Tech cards which provide several
          serial ports.  The driver is experimental and can currently only be
@@ -348,22 +348,6 @@ config ISTALLION
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 
-config SERIAL_TX3912
-       bool "TX3912/PR31700 serial port support"
-       depends on SERIAL_NONSTANDARD && MIPS && BROKEN_ON_SMP
-       help
-         The TX3912 is a Toshiba RISC processor based o the MIPS 3900 core;
-         see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>.
-         Say Y here to enable kernel support for the on-board serial port.
-
-config SERIAL_TX3912_CONSOLE
-       bool "Console on TX3912/PR31700 serial port"
-       depends on SERIAL_TX3912
-       help
-         The TX3912 is a Toshiba RISC processor based o the MIPS 3900 core;
-         see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>.
-         Say Y here to direct console I/O to the on-board serial port.
-
 config AU1000_UART
        bool "Enable Au1000 UART Support"
        depends on SERIAL_NONSTANDARD && MIPS
@@ -478,6 +462,7 @@ config LEGACY_PTYS
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS
+       range 1 256
        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.
@@ -780,6 +765,23 @@ config EFI_RTC
        bool "EFI Real Time Clock Services"
        depends on IA64
 
+config DS1302
+       tristate "DS1302 RTC support"
+       depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
+       help
+         If you say Y here and create a character special file /dev/rtc with
+         major number 121 and minor number 0 using mknod ("man mknod"), you
+         will get access to the real time clock (or hardware clock) built
+         into your computer.
+
+config S3C2410_RTC
+       bool "S3C2410 RTC Driver"
+       depends on ARCH_S3C2410
+       help
+         RTC (Realtime Clock) driver for the clock inbuilt into the
+         Samsung S3C2410. This can provide periodic interrupt rates
+         from 1Hz to 64Hz for user programs, and wakeup from Alarm.
+
 config COBALT_LCD
        bool "Support for Cobalt LCD"
        depends on MIPS_COBALT
@@ -826,7 +828,7 @@ config APPLICOM
 
 config SONYPI
        tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && X86 && PCI && !64BIT
+       depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT
        ---help---
          This driver enables access to the Sony Programmable I/O Control
          Device which can be found in many (all ?) Sony Vaio laptops.