summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 13:04:10 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 18:26:52 +0200
commit54720c301a7d54df702c9b42886838c0c868c236 (patch)
tree4322e8476fd8ac30d35424660b405472c7bfd2e8 /net/nfc
parentdeccb2a207003e01b0b8a6e30ece5b5735a800b1 (diff)
downloadop-kernel-dev-54720c301a7d54df702c9b42886838c0c868c236.zip
op-kernel-dev-54720c301a7d54df702c9b42886838c0c868c236.tar.gz
NFC: Remove CONFIG_EXPERIMENTAL from the LLCP 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/llcp/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp/Kconfig b/net/nfc/llcp/Kconfig
index fbf5e81..a1a41cd 100644
--- a/net/nfc/llcp/Kconfig
+++ b/net/nfc/llcp/Kconfig
@@ -1,6 +1,6 @@
config NFC_LLCP
- depends on NFC && EXPERIMENTAL
- bool "NFC LLCP support (EXPERIMENTAL)"
+ depends on NFC
+ bool "NFC LLCP support"
default n
help
Say Y here if you want to build support for a kernel NFC LLCP
OpenPOWER on IntegriCloud