diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 11:14:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 11:14:53 -0400 |
commit | 65929215d85702dd4a76db0ba9fbfc022ab99e55 (patch) | |
tree | eb8ab392b7719a236892fbd70cbdc9271e59f8f3 /drivers/misc | |
parent | a4136b49fbb9a6a885618ca38e66b4967091a9ec (diff) |
char/misc: remove CONFIG_EXPERIMENTAL dependencies
As discussed at the kernel summit this year, CONFIG_EXPERIMENTAL means
nothing, so let's get rid of it.
Cc: Kees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/Kconfig | 14 | ||||
-rw-r--r-- | drivers/misc/c2port/Kconfig | 5 | ||||
-rw-r--r-- | drivers/misc/eeprom/Kconfig | 2 | ||||
-rw-r--r-- | drivers/misc/mei/Kconfig | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 98a442da892a..99c73352c430 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -105,7 +105,7 @@ config ATMEL_TCB_CLKSRC_BLOCK | |||
105 | 105 | ||
106 | config IBM_ASM | 106 | config IBM_ASM |
107 | tristate "Device driver for IBM RSA service processor" | 107 | tristate "Device driver for IBM RSA service processor" |
108 | depends on X86 && PCI && INPUT && EXPERIMENTAL | 108 | depends on X86 && PCI && INPUT |
109 | ---help--- | 109 | ---help--- |
110 | This option enables device driver support for in-band access to the | 110 | This option enables device driver support for in-band access to the |
111 | IBM RSA (Condor) service processor in eServer xSeries systems. | 111 | IBM RSA (Condor) service processor in eServer xSeries systems. |
@@ -162,8 +162,8 @@ config SGI_IOC4 | |||
162 | Otherwise say N. | 162 | Otherwise say N. |
163 | 163 | ||
164 | config TIFM_CORE | 164 | config TIFM_CORE |
165 | tristate "TI Flash Media interface support (EXPERIMENTAL)" | 165 | tristate "TI Flash Media interface support" |
166 | depends on EXPERIMENTAL && PCI | 166 | depends on PCI |
167 | help | 167 | help |
168 | If you want support for Texas Instruments(R) Flash Media adapters | 168 | If you want support for Texas Instruments(R) Flash Media adapters |
169 | you should select this option and then also choose an appropriate | 169 | you should select this option and then also choose an appropriate |
@@ -178,8 +178,8 @@ config TIFM_CORE | |||
178 | be called tifm_core. | 178 | be called tifm_core. |
179 | 179 | ||
180 | config TIFM_7XX1 | 180 | config TIFM_7XX1 |
181 | tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)" | 181 | tristate "TI Flash Media PCI74xx/PCI76xx host adapter support" |
182 | depends on PCI && TIFM_CORE && EXPERIMENTAL | 182 | depends on PCI && TIFM_CORE |
183 | default TIFM_CORE | 183 | default TIFM_CORE |
184 | help | 184 | help |
185 | This option enables support for Texas Instruments(R) PCI74xx and | 185 | This option enables support for Texas Instruments(R) PCI74xx and |
@@ -192,7 +192,7 @@ config TIFM_7XX1 | |||
192 | 192 | ||
193 | config ICS932S401 | 193 | config ICS932S401 |
194 | tristate "Integrated Circuits ICS932S401" | 194 | tristate "Integrated Circuits ICS932S401" |
195 | depends on I2C && EXPERIMENTAL | 195 | depends on I2C |
196 | help | 196 | help |
197 | If you say yes here you get support for the Integrated Circuits | 197 | If you say yes here you get support for the Integrated Circuits |
198 | ICS932S401 clock control chips. | 198 | ICS932S401 clock control chips. |
@@ -398,7 +398,7 @@ config EP93XX_PWM | |||
398 | 398 | ||
399 | config DS1682 | 399 | config DS1682 |
400 | tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm" | 400 | tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm" |
401 | depends on I2C && EXPERIMENTAL | 401 | depends on I2C |
402 | help | 402 | help |
403 | If you say yes here you get support for Dallas Semiconductor | 403 | If you say yes here you get support for Dallas Semiconductor |
404 | DS1682 Total Elapsed Time Recorder. | 404 | DS1682 Total Elapsed Time Recorder. |
diff --git a/drivers/misc/c2port/Kconfig b/drivers/misc/c2port/Kconfig index 33ee834e1b83..0dd690e61d3c 100644 --- a/drivers/misc/c2port/Kconfig +++ b/drivers/misc/c2port/Kconfig | |||
@@ -3,8 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menuconfig C2PORT | 5 | menuconfig C2PORT |
6 | tristate "Silicon Labs C2 port support (EXPERIMENTAL)" | 6 | tristate "Silicon Labs C2 port support" |
7 | depends on EXPERIMENTAL | ||
8 | default n | 7 | default n |
9 | help | 8 | help |
10 | This option enables support for Silicon Labs C2 port used to | 9 | This option enables support for Silicon Labs C2 port used to |
@@ -22,7 +21,7 @@ menuconfig C2PORT | |||
22 | if C2PORT | 21 | if C2PORT |
23 | 22 | ||
24 | config C2PORT_DURAMAR_2150 | 23 | config C2PORT_DURAMAR_2150 |
25 | tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" | 24 | tristate "C2 port support for Eurotech's Duramar 2150" |
26 | depends on X86 | 25 | depends on X86 |
27 | default n | 26 | default n |
28 | help | 27 | help |
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 701edf658970..c9e695ea7c9a 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig | |||
@@ -50,7 +50,7 @@ config EEPROM_LEGACY | |||
50 | 50 | ||
51 | config EEPROM_MAX6875 | 51 | config EEPROM_MAX6875 |
52 | tristate "Maxim MAX6874/5 power supply supervisor" | 52 | tristate "Maxim MAX6874/5 power supply supervisor" |
53 | depends on I2C && EXPERIMENTAL | 53 | depends on I2C |
54 | help | 54 | help |
55 | If you say yes here you get read-only support for the user EEPROM of | 55 | If you say yes here you get read-only support for the user EEPROM of |
56 | the Maxim MAX6874/5 EEPROM-programmable, quad power-supply | 56 | the Maxim MAX6874/5 EEPROM-programmable, quad power-supply |
diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index 47d78a72db2e..5a79ccde2fdf 100644 --- a/drivers/misc/mei/Kconfig +++ b/drivers/misc/mei/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config INTEL_MEI | 1 | config INTEL_MEI |
2 | tristate "Intel Management Engine Interface (Intel MEI)" | 2 | tristate "Intel Management Engine Interface (Intel MEI)" |
3 | depends on X86 && PCI && EXPERIMENTAL && WATCHDOG_CORE | 3 | depends on X86 && PCI && WATCHDOG_CORE |
4 | help | 4 | help |
5 | The Intel Management Engine (Intel ME) provides Manageability, | 5 | The Intel Management Engine (Intel ME) provides Manageability, |
6 | Security and Media services for system containing Intel chipsets. | 6 | Security and Media services for system containing Intel chipsets. |