Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux.git] / net / nfc / llcp_sock.c

diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp_sock.c
similarity index 99%
rename from net/nfc/llcp/sock.c
rename to net/nfc/llcp_sock.c
index d6faa47c9bbab217df079d7b39be613bc8a05061..38f08c31cdd878dea45df5dd8d01d2c21d90911f 100644 (file)
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp_sock.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/nfc.h>
 
-#include "../nfc.h"
+#include "nfc.h"
 #include "llcp.h"
 
 static int sock_wait_state(struct sock *sk, int state, unsigned long timeo)