Merge tag 'md/4.2' of git://neil.brown.name/md

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

diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index a4292d790f9b900130462d7f4bf7b3f64e3dec7b..368b6dfe71b311297d4479ce82b94c15be046ce1 100644 (file)
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -12,7 +12,5 @@ obj-$(CONFIG_NFC_PORT100)     += port100.o
 obj-$(CONFIG_NFC_MRVL)         += nfcmrvl/
 obj-$(CONFIG_NFC_TRF7970A)     += trf7970a.o
 obj-$(CONFIG_NFC_ST21NFCA)     += st21nfca/
-obj-$(CONFIG_NFC_ST21NFCB)     += st21nfcb/
+obj-$(CONFIG_NFC_ST_NCI)       += st-nci/
 obj-$(CONFIG_NFC_NXP_NCI)      += nxp-nci/
-
-ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG