diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/nfc/Makefile | |
parent | 31817df025e24559a01d33ddd68bd11b21bf9d7b (diff) | |
parent | 5f0dd296a01c8173fcc05a8b262a1168ae90bc74 (diff) | |
download | talos-op-linux-204d1641d200709c759d8c269458cbc7de378c40.tar.gz talos-op-linux-204d1641d200709c759d8c269458cbc7de378c40.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/nfc/Makefile')
-rw-r--r-- | drivers/nfc/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile index a4efb164ec49..8ef446d2c1bd 100644 --- a/drivers/nfc/Makefile +++ b/drivers/nfc/Makefile @@ -3,3 +3,6 @@ # obj-$(CONFIG_PN544_NFC) += pn544.o +obj-$(CONFIG_NFC_PN533) += pn533.o + +ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG |