From: Kees Cook <keescook@chromium.org>
Date: Tue, 23 Oct 2012 20:04:10 +0000 (-0700)
Subject: NFC: Remove CONFIG_EXPERIMENTAL from the LLCP Makefile
X-Git-Tag: v3.8-rc1~139^2~337^2^2~67^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54720c301a7d54df702c9b42886838c0c868c236;p=thirdparty%2Fkernel%2Flinux.git

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

diff --git a/net/nfc/llcp/Kconfig b/net/nfc/llcp/Kconfig
index fbf5e81509085..a1a41cd68255a 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