Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm

[~andy/linux] / net / nfc / Makefile

diff --git a/net/nfc/Makefile b/net/nfc/Makefile
index 16250c3538519bbc724d9ebdf9ea629fc576daa5..fbb550f2377b9298f755ee5a63428d9f93a06b69 100644 (file)
--- a/net/nfc/Makefile
+++ b/net/nfc/Makefile
@@ -3,5 +3,6 @@
 #
 
 obj-$(CONFIG_NFC) += nfc.o
+obj-$(CONFIG_NFC_NCI) += nci/
 
 nfc-objs := core.o netlink.o af_nfc.o rawsock.o