Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / nfc / Kconfig

diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index ea1580085347fda5a378dfc3e2291c918ba86a66..2acff4307ca401c70b40909826e9d5e1cccb6c3f 100644 (file)
--- 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,5 +17,14 @@ config PN544_NFC
          To compile this driver as a module, choose m here. The module will
          be called pn544.
 
+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).
 
-endif # NFC_DEVICES
+endmenu