diff options
| author | John W. Linville | 2013-05-29 10:59:35 -0400 |
|---|---|---|
| committer | John W. Linville | 2013-05-29 10:59:35 -0400 |
| commit | 50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3 (patch) | |
| tree | 50a1488b5bf44499fe8d2ad73543bf7f8fc4b05b /net/nfc/Makefile | |
| parent | 8e6d91ae0917bf934ed86411148f79d904728d51 (diff) | |
| parent | add295a4afbdf5852d004c754c552d692b0fcac8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/nfc/Makefile')
| -rw-r--r-- | net/nfc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/nfc/Makefile b/net/nfc/Makefile index fb799deaed4f..a76f4533cb6c 100644 --- a/net/nfc/Makefile +++ b/net/nfc/Makefile @@ -5,7 +5,6 @@ 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 |