Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 041b656c4ca49ecf6c14facabbbf704f3728e189..b151b7c1bd59d9fe0f7cad745802572a6f7156ea 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -95,7 +95,7 @@ config ATMEL_TCB_CLKSRC_BLOCK
 
 config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
-       depends on X86 && PCI && INPUT && EXPERIMENTAL
+       depends on X86 && PCI && INPUT
        ---help---
          This option enables device driver support for in-band access to the
          IBM RSA (Condor) service processor in eServer xSeries systems.
@@ -152,8 +152,8 @@ config SGI_IOC4
          Otherwise say N.
 
 config TIFM_CORE
-       tristate "TI Flash Media interface support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PCI
+       tristate "TI Flash Media interface support"
+       depends on PCI
        help
          If you want support for Texas Instruments(R) Flash Media adapters
          you should select this option and then also choose an appropriate
@@ -168,8 +168,8 @@ config TIFM_CORE
          be called tifm_core.
 
 config TIFM_7XX1
-       tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)"
-       depends on PCI && TIFM_CORE && EXPERIMENTAL
+       tristate "TI Flash Media PCI74xx/PCI76xx host adapter support"
+       depends on PCI && TIFM_CORE
        default TIFM_CORE
        help
          This option enables support for Texas Instruments(R) PCI74xx and
@@ -182,7 +182,7 @@ config TIFM_7XX1
 
 config ICS932S401
        tristate "Integrated Circuits ICS932S401"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for the Integrated Circuits
          ICS932S401 clock control chips.
@@ -388,7 +388,7 @@ config EP93XX_PWM
 
 config DS1682
        tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
-       depends on I2C && EXPERIMENTAL
+       depends on I2C
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1682 Total Elapsed Time Recorder.