aboutsummaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 13:04:11 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 18:26:53 +0200
commitf152218840f2dc60900e2568878d3b87460d5ae8 (patch)
tree3125b1b67dddb769dda297a5bb7e9607013a368f /net/nfc
parent54720c301a7d54df702c9b42886838c0c868c236 (diff)
downloadlinux-f152218840f2dc60900e2568878d3b87460d5ae8.tar.gz
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>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/nci/Kconfig b/net/nfc/nci/Kconfig
index decdc49b26d..6d69b5f0f19 100644
--- 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