From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/net/nfc/hci/core.c | 3 ++- kernel/net/nfc/hci/llc.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel/net/nfc/hci') diff --git a/kernel/net/nfc/hci/core.c b/kernel/net/nfc/hci/core.c index 6e061da22..2b0f0ac49 100644 --- a/kernel/net/nfc/hci/core.c +++ b/kernel/net/nfc/hci/core.c @@ -678,7 +678,8 @@ static int hci_activate_target(struct nfc_dev *nfc_dev, } static void hci_deactivate_target(struct nfc_dev *nfc_dev, - struct nfc_target *target) + struct nfc_target *target, + u8 mode) { } diff --git a/kernel/net/nfc/hci/llc.c b/kernel/net/nfc/hci/llc.c index 1b90c0531..1399a03fa 100644 --- a/kernel/net/nfc/hci/llc.c +++ b/kernel/net/nfc/hci/llc.c @@ -144,11 +144,13 @@ inline int nfc_llc_start(struct nfc_llc *llc) { return llc->ops->start(llc); } +EXPORT_SYMBOL(nfc_llc_start); inline int nfc_llc_stop(struct nfc_llc *llc) { return llc->ops->stop(llc); } +EXPORT_SYMBOL(nfc_llc_stop); inline void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb) { -- cgit 1.2.3-korg