diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:37 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:37 -0400 |
| commit | e298c79efcf7b88fded994a03375589d8b726ce7 (patch) | |
| tree | ca430a7220b7ee30c1a0aa09b5e2c1511c9d0e4c /net/nfc/nci/Kconfig | |
| parent | d1f10302568221c20628200bc8baa426c55f61c0 (diff) | |
| parent | 52feb444a90304eb13c03115bb9758101dbb9254 (diff) | |
Merge tag 'nfc-next-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
This is the first NFC pull request for 3.8
With this one we have:
- pn544 p2p support.
- pn544 physical and HCI layers separation. We are getting the pn544 driver
ready to support non i2c physical layers.
- LLCP SNL (Service Name Lookup). This is the NFC p2p service discovery
protocol.
- LLCP datagram sockets (connection less) support.
- IDR library usage for NFC devices indexes assignement.
- NFC netlink extension for setting and getting LLCP link characteristics.
- Various code style fixes and cleanups spread over the pn533, LLCP, HCI and
pn544 code.
Diffstat (limited to 'net/nfc/nci/Kconfig')
| -rw-r--r-- | net/nfc/nci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/nci/Kconfig b/net/nfc/nci/Kconfig index decdc49b26d..6d69b5f0f19 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 |