Merge branch 'parisc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

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

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 8fd255f7ee40e9f64ea04f606f7157ac28f7c808..b90f85bf5f811c098bfc01b9ed47ee8ee8c7bf00 100644 (file)
--- 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