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>

diff --git a/MAINTAINERS b/MAINTAINERS
index ce0e60c7b07ac240acc8be2674c6ec886871fe00..1789ce22ea8c5f66bc92e2f1243a80c894fdbeb3 100644 (file)
--- 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 c78eb6afd0cb7745adb73ed5ccadf60259a59882..7bcb1febef0dd06246642f58878cace232706500 100644 (file)
--- 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
similarity index 100%
rename from include/net/nfc.h
rename to include/net/nfc/nfc.h

diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 1a877de8e23011d4f080d94da6c42d8a1f822093..b6753f45624e3e3fdd17c4338173778ee21b136b 100644 (file)
--- 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)))