Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[linux-2.6-block.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b588317f23935e92ba9c4c23eaa788de7ed573e8..a3725de923848baba3c55f3067588f42759b5227 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -22,7 +22,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
        tristate "ALI 1563"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          If you say yes to this option, support will be included for the SMB
          Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -56,7 +56,7 @@ config I2C_AMD756
 
 config I2C_AMD756_S4882
        tristate "SMBus multiplexing on the Tyan S4882"
-       depends on I2C_AMD756 && X86 && EXPERIMENTAL
+       depends on I2C_AMD756 && X86
        help
          Enabling this option will add specific SMBus support for the Tyan
          S4882 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -176,7 +176,7 @@ config I2C_NFORCE2
 
 config I2C_NFORCE2_S4985
        tristate "SMBus multiplexing on the Tyan S4985"
-       depends on I2C_NFORCE2 && X86 && EXPERIMENTAL
+       depends on I2C_NFORCE2 && X86
        help
          Enabling this option will add specific SMBus support for the Tyan
          S4985 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -227,7 +227,7 @@ config I2C_SIS96X
 
 config I2C_VIA
        tristate "VIA VT82C586B"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the VIA
@@ -279,7 +279,7 @@ comment "Mac SMBus host controller drivers"
 
 config I2C_HYDRA
        tristate "CHRP Apple Hydra Mac I/O I2C interface"
-       depends on PCI && PPC_CHRP && EXPERIMENTAL
+       depends on PCI && PPC_CHRP
        select I2C_ALGOBIT
        help
          This supports the use of the I2C interface in the Apple Hydra Mac
@@ -305,7 +305,7 @@ comment "I2C system bus drivers (mostly embedded / system-on-chip)"
 
 config I2C_AT91
        tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
-       depends on ARCH_AT91 && EXPERIMENTAL
+       depends on ARCH_AT91
        help
          This supports the use of the I2C interface on Atmel AT91
          processors.
@@ -543,7 +543,6 @@ config I2C_NUC900
 
 config I2C_OCORES
        tristate "OpenCores I2C Controller"
-       depends on EXPERIMENTAL
        help
          If you say yes to this option, support will be included for the
          OpenCores I2C controller. For details see
@@ -736,7 +735,7 @@ config I2C_OCTEON
 
 config I2C_XILINX
        tristate "Xilinx I2C Controller"
-       depends on EXPERIMENTAL && HAS_IOMEM
+       depends on HAS_IOMEM
        help
          If you say yes to this option, support will be included for the
          Xilinx I2C controller.
@@ -827,7 +826,7 @@ config I2C_PARPORT_LIGHT
 
 config I2C_TAOS_EVM
        tristate "TAOS evaluation module"
-       depends on EXPERIMENTAL
+       depends on TTY
        select SERIO
        select SERIO_SERPORT
        default n