Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d0c978fbc2048b1b28d2780c1319925ca45fcc26..2df42fdcdc91d5ae87991f1de54de44b756ab040 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -127,7 +127,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
@@ -631,7 +631,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.
@@ -905,8 +906,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
 
@@ -1071,5 +1072,11 @@ 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
+
 endmenu