NFC: move nfc.h from include/net to include/net/nfc
Ilan Elias [Sun, 18 Sep 2011 08:19:34 +0000 (11:19 +0300)]
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>

MAINTAINERS
drivers/nfc/pn533.c
include/net/nfc/nfc.h [moved from include/net/nfc.h with 100% similarity]
net/nfc/nfc.h

index ce0e60c..1789ce2 100644 (file)
@@ -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
index c78eb6a..7bcb1fe 100644 (file)
@@ -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"
 
similarity index 100%
rename from include/net/nfc.h
rename to include/net/nfc/nfc.h
index 1a877de..b6753f4 100644 (file)
@@ -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)))