diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-19 18:54:26 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-19 18:54:26 (GMT) |
| commit | 9f6e20cee6253c4ca5faacba8dbd09ebe70132ed (patch) | |
| tree | 0dbcdabca91864daaf174bb014a5f46316880403 /net/nfc/Makefile | |
| parent | d1d182e00d72300e05b18e28372fab003d8d4a58 (diff) | |
| parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) | |
| download | linux-fsl-qoriq-9f6e20cee6253c4ca5faacba8dbd09ebe70132ed.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/Makefile b/net/nfc/Makefile index fbb550f..7b4a6dc 100644 --- a/net/nfc/Makefile +++ b/net/nfc/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_NFC) += nfc.o obj-$(CONFIG_NFC_NCI) += nci/ nfc-objs := core.o netlink.o af_nfc.o rawsock.o +nfc-$(CONFIG_NFC_LLCP) += llcp/llcp.o llcp/commands.o llcp/sock.o |