summaryrefslogtreecommitdiffstats
path: root/net/nfc/netlink.c
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/netlink.c
parentb006ed545cbadf1ebd4683719554742d20dbcede (diff)
downloadop-kernel-dev-30cc4587659e1c9b1bfade8b2a757d91e04758ab.zip
op-kernel-dev-30cc4587659e1c9b1bfade8b2a757d91e04758ab.tar.gz
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/netlink.c')
-rw-r--r--net/nfc/netlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 73fd510..f0c4d61 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -28,8 +28,7 @@
#include <linux/slab.h>
#include "nfc.h"
-
-#include "llcp/llcp.h"
+#include "llcp.h"
static struct genl_multicast_group nfc_genl_event_mcgrp = {
.name = NFC_GENL_MCAST_EVENT_NAME,
OpenPOWER on IntegriCloud