2011-08-16 17:36:16

by Elias, Ilan

[permalink] [raw]
Subject: [PATCH 2/4] NFC: Move nfc.h from include/net to include/net/nfc

The nfc.h file was moved from include/net to include/net/nfc, since 2 new header files were added to the new include/net/nfc folder.

Signed-off-by: Ilan Elias <[email protected]>
---
drivers/nfc/pn533.c | 2 +-
include/net/{ => nfc}/nfc.h | 0
net/nfc/nfc.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/net/{ => nfc}/nfc.h (100%)

diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index d931e9c..dfea75f 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
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 1a877de..b6753f4 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)))
--
1.7.0.4