Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / Makefile

diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index 56ab822ba03d9f1be61a544f975368de086b75ba..ae42a3fa60c981b965bbb0cdb004b7c3c591d01d 100644 (file)
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -10,5 +10,6 @@ obj-$(CONFIG_NFC_MEI_PHY)     += mei_phy.o
 obj-$(CONFIG_NFC_SIM)          += nfcsim.o
 obj-$(CONFIG_NFC_PORT100)      += port100.o
 obj-$(CONFIG_NFC_MRVL)         += nfcmrvl/
+obj-$(CONFIG_NFC_TRF7970A)     += trf7970a.o
 
 ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG