NFC: Remove CONFIG_EXPERIMENTAL from the NCI Makefile

This 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.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/net/nfc/nci/Kconfig b/net/nfc/nci/Kconfig
index decdc49b26d873ebcb62e6bf8047af6f648c483a..6d69b5f0f19b0ab97c779375cf6fa7bf474fc1b5 100644 (file)
--- a/net/nfc/nci/Kconfig
+++ b/net/nfc/nci/Kconfig
@@ -1,6 +1,6 @@
 config NFC_NCI
-       depends on NFC && EXPERIMENTAL
-       tristate "NCI protocol support (EXPERIMENTAL)"
+       depends on NFC
+       tristate "NCI protocol support"
        default n
        help
          NCI (NFC Controller Interface) is a communication protocol between