From ff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 23 Oct 2015 13:56:16 +0200 Subject: last driver import from 3.2.72 for now --- drivers/nfc/Kconfig | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'drivers/nfc/Kconfig') diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig index 61aa96a..5af95927 100644 --- a/drivers/nfc/Kconfig +++ b/drivers/nfc/Kconfig @@ -2,17 +2,8 @@ # Near Field Communication (NFC) devices # -menuconfig NFC_DEVICES - bool "Near Field Communication (NFC) devices" - default n - ---help--- - You'll have to say Y if your computer contains an NFC device that - you want to use under Linux. - - You can say N here if you don't have any Near Field Communication - devices connected to your computer. - -if NFC_DEVICES +menu "Near Field Communication (NFC) devices" + depends on NFC config PN544_NFC tristate "PN544 NFC driver" @@ -26,16 +17,25 @@ config PN544_NFC To compile this driver as a module, choose m here. The module will be called pn544. -config PN65N_NFC - tristate "PN65N NFC driver" - depends on I2C - select CRC_CCITT - default n - ---help--- - Say yes if you want PN65N Near Field Communication driver. - This is for i2c connected version. If unsure, say N here. +config NFC_PN533 + tristate "NXP PN533 USB driver" + depends on USB + help + NXP PN533 USB driver. + This driver provides support for NFC NXP PN533 devices. - To compile this driver as a module, choose m here. The module will - be called pn65n. + Say Y here to compile support for PN533 devices into the + kernel or say M to compile it as module (pn533). + +config NFC_WILINK + tristate "Texas Instruments NFC WiLink driver" + depends on TI_ST && NFC_NCI + help + This enables the NFC driver for Texas Instrument's BT/FM/GPS/NFC + combo devices. This makes use of shared transport line discipline + core driver to communicate with the NFC core of the combo chip. + + Say Y here to compile support for Texas Instrument's NFC WiLink driver + into the kernel or say M to compile it as module. -endif # NFC_DEVICES +endmenu -- cgit v1.1