summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlan Elias <ilane@ti.com>2011-09-18 11:19:34 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-09-20 14:43:49 -0400
commit55eb94f9e923cba376cdf48ea5ab28d81116bead (patch)
tree9b70d091a80087bcc02d261b50e335c8b1cca163
parent8b3fe7b591b3c50061a8701f8eda14033420577b (diff)
NFC: move nfc.h from include/net to include/net/nfc
The file nfc.h was moved from include/net to include/net/nfc, since new NFC header files will be added to include/net/nfc. Signed-off-by: Ilan Elias <ilane@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/nfc/pn533.c2
-rw-r--r--include/net/nfc/nfc.h (renamed from include/net/nfc.h)0
-rw-r--r--net/nfc/nfc.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ce0e60c7b07..1789ce22ea8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4508,7 +4508,7 @@ L: linux-wireless@vger.kernel.org
S: Maintained
F: net/nfc/
F: include/linux/nfc.h
-F: include/net/nfc.h
+F: include/net/nfc/
F: drivers/nfc/
NFS, SUNRPC, AND LOCKD CLIENTS
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index c78eb6afd0c..7bcb1febef0 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -28,7 +28,7 @@
#include <linux/usb.h>
#include <linux/nfc.h>
#include <linux/netdevice.h>
-#include <net/nfc.h>
+#include <net/nfc/nfc.h>
#define VERSION "0.1"
diff --git a/include/net/nfc.h b/include/net/nfc/nfc.h
index 6a7f602aa84..6a7f602aa84 100644
--- a/include/net/nfc.h
+++ b/include/net/nfc/nfc.h
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 1a877de8e23..b6753f45624 100644
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -24,7 +24,7 @@
#ifndef __LOCAL_NFC_H
#define __LOCAL_NFC_H
-#include <net/nfc.h>
+#include <net/nfc/nfc.h>
#include <net/sock.h>
__attribute__((format (printf, 2, 3)))