浏览代码

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>
Ilan Elias 13 年之前
父节点
当前提交
55eb94f9e9
共有 4 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      MAINTAINERS
  2. 1 1
      drivers/nfc/pn533.c
  3. 0 0
      include/net/nfc/nfc.h
  4. 1 1
      net/nfc/nfc.h

+ 1 - 1
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

+ 1 - 1
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"
 

+ 0 - 0
include/net/nfc.h → include/net/nfc/nfc.h


+ 1 - 1
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)))