Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30cc4587 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b006ed54
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -15,6 +15,5 @@ menuconfig NFC

source "net/nfc/nci/Kconfig"
source "net/nfc/hci/Kconfig"
source "net/nfc/llcp/Kconfig"

source "drivers/nfc/Kconfig"
+4 −2
Original line number Diff line number Diff line
@@ -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
+0 −0

File moved.

net/nfc/llcp/Kconfig

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line
config NFC_LLCP
       depends on NFC
       bool "NFC LLCP support"
       default n
       help
	 Say Y here if you want to build support for a kernel NFC LLCP
	 implementation.
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@

#include <net/nfc/nfc.h>

#include "../nfc.h"
#include "nfc.h"
#include "llcp.h"

static u8 llcp_tlv_length[LLCP_TLV_MAX] = {
Loading