From: Kees Cook <keescook@chromium.org>
Date: Tue, 23 Oct 2012 20:04:11 +0000 (-0700)
Subject: NFC: Remove CONFIG_EXPERIMENTAL from the NCI Makefile
X-Git-Tag: MMI-PSA29.97-13-9~15401^2~17^2~315^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f152218840f2dc60900e2568878d3b87460d5ae8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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 decdc49b26d8..6d69b5f0f19b 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