From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Date: Fri, 17 May 2013 11:00:43 +0000 (-0700)
Subject: backports: address NFC LLCP code shift
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92c55efc46f830a3f25ae93c0d568677c3c7b0c9;p=openwrt%2Fstaging%2Fblogic.git

backports: address NFC LLCP code shift

Samuel folded code under net/nfc/llcp/ onto
the parent net/nfc/ directory with llcp_ prefixes
for the files. Address this change introduced
as of next-20130430.

commit 30cc4587659e1c9b1bfade8b2a757d91e04758ab
Author: Samuel Ortiz <sameo@linux.intel.com>
Date:   Fri Apr 26 11:49:40 2013 +0200

    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>

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/copy-list b/copy-list
index f2afa15cf424..c7dcf396a400 100644
--- a/copy-list
+++ b/copy-list
@@ -129,7 +129,6 @@ drivers/gpu/drm/
 # NFC core
 net/nfc/
 net/nfc/hci/
-net/nfc/llcp/
 net/nfc/nci/
 include/net/nfc/
 include/uapi/linux/nfc.h