undeprecate raw driver

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 1e32fb834eb82747abf650434cb550cb06404126..ec9dc3d53f18355ded75309baf8afd7746563032 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.
@@ -372,20 +374,6 @@ config ISTALLION
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 
-config AU1000_UART
-       bool "Enable Au1000 UART Support"
-       depends on SERIAL_NONSTANDARD && MIPS
-       help
-         If you have an Alchemy AU1000 processor (MIPS based) and you want
-         to use serial ports, say Y.  Otherwise, say N.
-
-config AU1000_SERIAL_CONSOLE
-       bool "Enable Au1000 serial console"
-       depends on AU1000_UART
-       help
-         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
@@ -631,7 +619,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.
@@ -764,7 +753,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
@@ -812,7 +801,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 && !MIPS && !SPARC && !FRV && !S390 && !SUPERH
        ---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
@@ -857,6 +846,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
@@ -989,15 +979,14 @@ config GPIO_VR41XX
        depends on CPU_VR41XX
 
 config RAW_DRIVER
-       tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
+       tristate "RAW driver (/dev/raw/rawN)"
        depends on BLOCK
        help
-         The raw driver permits block devices to be bound to /dev/raw/rawN. 
-         Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
+         The raw driver permits block devices to be bound to /dev/raw/rawN.
+         Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
          See the raw(8) manpage for more details.
 
-          The raw driver is deprecated and will be removed soon.
-          Applications should simply open the device (eg /dev/hda1)
+          Applications should preferably open the device (eg /dev/hda1)
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS
@@ -1042,7 +1031,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
@@ -1077,5 +1066,7 @@ config DEVPORT
        depends on ISA || PCI
        default y
 
+source "drivers/s390/char/Kconfig"
+
 endmenu