summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-02 11:18:44 -0700
committerKees Cook <keescook@chromium.org>2013-01-11 11:38:41 -0800
commit204911fb50da45790a97c9d217f8661b616ce33e (patch)
tree1fb03eacc7c9560abf9e3b2e68e787f325fb7ae9 /drivers
parent7d6bce7a358e4ff553623216ee535d6b14994d6a (diff)
downloadlinux-204911fb50da45790a97c9d217f8661b616ce33e.tar.gz
linux-204911fb50da45790a97c9d217f8661b616ce33e.tar.bz2
linux-204911fb50da45790a97c9d217f8661b616ce33e.zip
drivers/pcmcia: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. CC: Russell King <rmk+kernel@arm.linux.org.uk> CC: Manuel Lauss <manuel.lauss@googlemail.com> CC: Dominik Brodowski <linux@dominikbrodowski.net> CC: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pcmcia/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 8fd255f7ee40..b90f85bf5f81 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -36,8 +36,8 @@ config PCMCIA
If unsure, say Y.
config PCMCIA_LOAD_CIS
- bool "Load CIS updates from userspace (EXPERIMENTAL)"
- depends on PCMCIA && EXPERIMENTAL
+ bool "Load CIS updates from userspace"
+ depends on PCMCIA
select FW_LOADER
default y
help