summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorLauro Ramos Venancio <lauro.venancio@openbossa.org>2011-07-01 19:31:33 -0300
committerJohn W. Linville <linville@tuxdriver.com>2011-07-05 15:26:57 -0400
commit3e256b8f8dfa309a80b5dece388d85d9a9801a29 (patch)
treed5936ec25998426c2166dbd954b0fd8cc32c56af /drivers/nfc
parent2b4562dfd6ad3579951de21168cb9d266ed3f1bd (diff)
downloadlinux-3e256b8f8dfa309a80b5dece388d85d9a9801a29.tar.bz2
NFC: add nfc subsystem core
The NFC subsystem core is responsible for providing the device driver interface. It is also responsible for providing an interface to the control operations and data exchange. Signed-off-by: Lauro Ramos Venancio <lauro.venancio@openbossa.org> Signed-off-by: Aloisio Almeida Jr <aloisio.almeida@openbossa.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/Kconfig16
-rw-r--r--drivers/nfc/Makefile2
2 files changed, 5 insertions, 13 deletions
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index ea1580085347..780928918fc3 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,5 +17,4 @@ config PN544_NFC
To compile this driver as a module, choose m here. The module will
be called pn544.
-
-endif # NFC_DEVICES
+endmenu
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index a4efb164ec49..25296f04ccbe 100644
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -3,3 +3,5 @@
#
obj-$(CONFIG_PN544_NFC) += pn544.o
+
+ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG