- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2e90cf6..d477c5f 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
@@ -641,7 +643,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.
@@ -774,7 +777,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
@@ -822,7 +825,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 && !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
@@ -867,6 +870,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
@@ -915,8 +919,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
 
@@ -1052,7 +1056,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
@@ -1081,6 +1085,14 @@ 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"
+
 config CRASHER
        tristate "Crasher Module"
        help