Skip to content

Commit

Permalink
NFC: move nfc.h from include/net to include/net/nfc
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Ilan Elias authored and John W. Linville committed Sep 20, 2011
1 parent 8b3fe7b commit 55eb94f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/nfc/pn533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
0 include/net/nfc.h → include/net/nfc/nfc.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion net/nfc/nfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down

0 comments on commit 55eb94f

Please sign in to comment.