summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 13:04:09 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 18:26:52 +0200
commitdeccb2a207003e01b0b8a6e30ece5b5735a800b1 (patch)
treef290b3c112d19d994f551c827fe75ce408a6aaef /net/nfc
parent0f450772224f99db3b8384bfb8f751889d0c4cb8 (diff)
downloadlinux-deccb2a207003e01b0b8a6e30ece5b5735a800b1.tar.gz
linux-deccb2a207003e01b0b8a6e30ece5b5735a800b1.tar.bz2
linux-deccb2a207003e01b0b8a6e30ece5b5735a800b1.zip
NFC: Remove CONFIG_EXPERIMENTAL
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/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
index 8d8d9bc4b6ff..60c3bbb63e8e 100644
--- a/net/nfc/Kconfig
+++ b/net/nfc/Kconfig
@@ -3,8 +3,8 @@
#
menuconfig NFC
- depends on NET && EXPERIMENTAL
- tristate "NFC subsystem support (EXPERIMENTAL)"
+ depends on NET
+ tristate "NFC subsystem support"
default n
help
Say Y here if you want to build support for NFC (Near field