summaryrefslogtreecommitdiffstats
path: root/net/nfc/Makefile
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-04-26 11:49:40 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-26 12:37:28 +0200
commit30cc4587659e1c9b1bfade8b2a757d91e04758ab (patch)
tree93a7ada48f9581851cdce979f09bcd0c3d4dd3d9 /net/nfc/Makefile
parentb006ed545cbadf1ebd4683719554742d20dbcede (diff)
downloadlinux-30cc4587659e1c9b1bfade8b2a757d91e04758ab.tar.gz
linux-30cc4587659e1c9b1bfade8b2a757d91e04758ab.tar.bz2
linux-30cc4587659e1c9b1bfade8b2a757d91e04758ab.zip
NFC: Move LLCP code to the NFC top level diirectory
And stop making it optional. LLCP is a fundamental part of the NFC specifications and making it optional does not make much sense. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/Makefile')
-rw-r--r--net/nfc/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/nfc/Makefile b/net/nfc/Makefile
index d1a117c2c401..fb799deaed4f 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