Merge omap-drivers

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 8a54a2b5c987eb274dec36ff33c06bdd1dc8924f..8dd3475b9c6a0d65ac86712bee48da52985aefdb 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -6,6 +6,7 @@ menu "Character devices"
 
 config VT
        bool "Virtual terminal" if EMBEDDED
+       depends on !S390
        select INPUT
        default y if !VIOCONS
        ---help---
@@ -81,6 +82,7 @@ config VT_HW_CONSOLE_BINDING
 
 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
+       depends on HAS_IOMEM
        ---help---
          Say Y here if you have any non-standard serial boards -- boards
          which aren't supported using the standard "dumb" serial driver.
@@ -127,7 +129,7 @@ config ROCKETPORT
 
 config CYCLADES
        tristate "Cyclades async mux support"
-       depends on SERIAL_NONSTANDARD
+       depends on SERIAL_NONSTANDARD && (PCI || ISA)
        ---help---
          This driver supports Cyclades Z and Y multiserial boards.
          You would need something like this to connect more than two modems to
@@ -386,6 +388,39 @@ config AU1000_SERIAL_CONSOLE
          If you have an Alchemy AU1000 processor (MIPS based) and you want
          to use a console on a serial port, say Y.  Otherwise, say N.
 
+config SERIAL_DEC
+       bool "DECstation serial support"
+       depends on MACH_DECSTATION
+       default y
+       help
+         This selects whether you want to be asked about drivers for
+         DECstation serial ports.
+
+         Note that the answer to this question won't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about DECstation serial ports.
+
+config SERIAL_DEC_CONSOLE
+       bool "Support for console on a DECstation serial port"
+       depends on SERIAL_DEC
+       default y
+       help
+         If you say Y here, it will be possible to use a serial port as the
+         system console (the system console is the device which receives all
+         kernel messages and warnings and which allows logins in single user
+         mode).  Note that the firmware uses ttyS0 as the serial console on
+         the Maxine and ttyS2 on the others.
+
+         If unsure, say Y.
+
+config ZS
+       bool "Z85C30 Serial Support"
+       depends on SERIAL_DEC
+       default y
+       help
+         Documentation on the Zilog 85C350 serial communications controller
+         is downloadable at <http://www.zilog.com/pdfs/serial/z85c30.pdf>
+
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
@@ -598,7 +633,8 @@ config HVC_CONSOLE
 
 config HVC_ISERIES
        bool "iSeries Hypervisor Virtual Console support"
-       depends on PPC_ISERIES && !VIOCONS
+       depends on PPC_ISERIES
+       default y
        select HVC_DRIVER
        help
          iSeries machines support a hypervisor virtual console.
@@ -731,7 +767,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH
+       depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390
        ---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
@@ -779,7 +815,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
-       depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV
+       depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390
        ---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
@@ -829,6 +865,7 @@ config COBALT_LCD
 
 config DTLK
        tristate "Double Talk PC internal speech card support"
+       depends on ISA
        help
          This driver is for the DoubleTalk PC, a speech synthesizer
          manufactured by RC Systems (<http://www.rcsys.com/>).  It is also
@@ -877,8 +914,8 @@ config SONYPI
          To compile this driver as a module, choose M here: the
          module will be called sonypi.
 
-config TANBAC_TB0219
-       tristate "TANBAC TB0219 base board support"
+config GPIO_TB0219
+       tristate "TANBAC TB0219 GPIO support"
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
@@ -1014,7 +1051,7 @@ config HPET_MMAP
 
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
-       depends on X86 || IA64 || PPC64
+       depends on X86 || IA64 || PPC64 || S390
        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system
@@ -1043,5 +1080,13 @@ config TELCLOCK
          /sys/devices/platform/telco_clock, with a number of files for
          controlling the behavior of this hardware.
 
+config DEVPORT
+       bool
+       depends on !M68K
+       depends on ISA || PCI
+       default y
+
+source "drivers/s390/char/Kconfig"
+
 endmenu