summaryrefslogtreecommitdiff
path: root/net/nfc/llcp/Kconfig
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-10-30 08:09:48 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2012-10-30 08:09:48 (GMT)
commit6fb47de9cf1be4710fb9f364c500ff216fb47b34 (patch)
treee638cd1de972e7120dff9200efe71ce1b4ca3805 /net/nfc/llcp/Kconfig
parent1041638f2bba0f1de75e66086d50fb1251d64dcf (diff)
parentab3d59d265e772e734c36fe738809cb1a910f566 (diff)
downloadlinux-fsl-qoriq-6fb47de9cf1be4710fb9f364c500ff216fb47b34.tar.xz
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/nfc/llcp/Kconfig')
-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