diff --git a/[refs] b/[refs] index 21146a565749..7918139d788c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54720c301a7d54df702c9b42886838c0c868c236 +refs/heads/master: f152218840f2dc60900e2568878d3b87460d5ae8 diff --git a/trunk/net/nfc/nci/Kconfig b/trunk/net/nfc/nci/Kconfig index decdc49b26d8..6d69b5f0f19b 100644 --- a/trunk/net/nfc/nci/Kconfig +++ b/trunk/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