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

Commit a8a48e60 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next 



Samuel Ortiz <sameo@linux.intel.com> says:

"With this one we have:

- One patch for moving the LLCP code into net/nfc.
  It fixes a build annoyance reported by Dave Miller caused by the fact
  that the LLCP code object targets are not in the same directory as the
  Makefile trying to build them is. It prevents us from doing e.g.

        make net/nfc/llcp/sock.o

  Moving the LLCP code into net/nfc and not making it optional anymore
  makes sense as LLCP is a fundamental piece of the NFC specifications
  and thus should be in the core NFC directory.

- One patch that fixes the missing dependency against RFKILL. Without it NFC
  fails to properly build when it's builtin and CONFIG_RFKILL=m."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents cc0446bf c204ea09

net/nfc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


menuconfig NFC

	depends on NET

	depends on RFKILL || !RFKILL

	tristate "NFC subsystem support"

	default n

	help
@@ -15,6 +16,5 @@ menuconfig NFC 


source "net/nfc/nci/Kconfig"

source "net/nfc/hci/Kconfig"

source "net/nfc/llcp/Kconfig"



source "drivers/nfc/Kconfig"

net/nfc/Makefile

+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

net/nfc/llcp/llcp.h→net/nfc/llcp.h

+0 −0

File moved.

View file

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

net/nfc/llcp/commands.c→net/nfc/llcp_commands.c

+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] = {