Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[deliverable/linux.git] / drivers / nfc / Kconfig

diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index 7437c9dfd8fc8b28735d3838468fafae826c34f6..ea8321a483f95a2f329255a55aeb4f6ecc4ba7bf 100644 (file)
--- a/drivers/nfc/Kconfig
+++ b/drivers/nfc/Kconfig
@@ -5,16 +5,6 @@
 menu "Near Field Communication (NFC) devices"
        depends on NFC
 
-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.
-
-         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
@@ -70,6 +60,7 @@ config NFC_PORT100
 
 source "drivers/nfc/fdp/Kconfig"
 source "drivers/nfc/pn544/Kconfig"
+source "drivers/nfc/pn533/Kconfig"
 source "drivers/nfc/microread/Kconfig"
 source "drivers/nfc/nfcmrvl/Kconfig"
 source "drivers/nfc/st21nfca/Kconfig"