diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-29 19:31:57 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-29 19:31:57 (GMT) |
| commit | 17a2911f3395d66694fcbd2e8970015904d9b034 (patch) | |
| tree | c93e40197d4614b5183f86f0335c5c7abcee31aa /net/nfc/Makefile | |
| parent | 94dace10142790ddeb0a3a7b8b33d9540d30c79f (diff) | |
| parent | a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c (diff) | |
| download | linux-fsl-qoriq-17a2911f3395d66694fcbd2e8970015904d9b034.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/nfc/Makefile')
| -rw-r--r-- | net/nfc/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/nfc/Makefile b/net/nfc/Makefile index d1a117c..fb799de 100644 --- a/net/nfc/Makefile +++ b/net/nfc/Makefile @@ -5,6 +5,8 @@ obj-$(CONFIG_NFC) += nfc.o obj-$(CONFIG_NFC_NCI) += nci/ obj-$(CONFIG_NFC_HCI) += hci/ +#obj-$(CONFIG_NFC_LLCP) += llcp/ + +nfc-objs := core.o netlink.o af_nfc.o rawsock.o llcp_core.o llcp_commands.o \ + llcp_sock.o -nfc-objs := core.o netlink.o af_nfc.o rawsock.o -nfc-$(CONFIG_NFC_LLCP) += llcp/llcp.o llcp/commands.o llcp/sock.o |