* [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc
@ 2011-09-13 8:46 Elias, Ilan
2011-09-19 10:04 ` Samuel Ortiz
2011-09-19 12:12 ` Samuel Ortiz
0 siblings, 2 replies; 4+ messages in thread
From: Elias, Ilan @ 2011-09-13 8:46 UTC (permalink / raw)
To: aloisio.almeida@openbossa.org, lauro.venancio@openbossa.org,
samuel@sortiz.org, linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org
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>
---
MAINTAINERS | 2 +-
drivers/nfc/pn533.c | 2 +-
include/net/{ => nfc}/nfc.h | 0
net/nfc/nfc.h | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename include/net/{ => nfc}/nfc.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 43f9137..869a4e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4517,7 +4517,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 c78eb6a..7bcb1fe 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc
2011-09-13 8:46 [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc Elias, Ilan
@ 2011-09-19 10:04 ` Samuel Ortiz
2011-09-19 12:12 ` Samuel Ortiz
1 sibling, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2011-09-19 10:04 UTC (permalink / raw)
To: Elias, Ilan
Cc: aloisio.almeida@openbossa.org, lauro.venancio@openbossa.org,
linville@tuxdriver.com, linux-wireless@vger.kernel.org
Hi Ilan,
On Tue, 2011-09-13 at 10:46 +0200, Elias, Ilan wrote:
> 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>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Cheers,
Samuel.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc
2011-09-13 8:46 [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc Elias, Ilan
2011-09-19 10:04 ` Samuel Ortiz
@ 2011-09-19 12:12 ` Samuel Ortiz
2011-09-20 23:13 ` Lauro Ramos Venancio
1 sibling, 1 reply; 4+ messages in thread
From: Samuel Ortiz @ 2011-09-19 12:12 UTC (permalink / raw)
To: Elias, Ilan
Cc: aloisio.almeida@openbossa.org, lauro.venancio@openbossa.org,
linville@tuxdriver.com, linux-wireless@vger.kernel.org
Hi Ilan,
On Tue, 2011-09-13 at 10:46 +0200, Elias, Ilan wrote:
> 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>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Cheers,
Samuel.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc
2011-09-19 12:12 ` Samuel Ortiz
@ 2011-09-20 23:13 ` Lauro Ramos Venancio
0 siblings, 0 replies; 4+ messages in thread
From: Lauro Ramos Venancio @ 2011-09-20 23:13 UTC (permalink / raw)
To: Elias, Ilan
Cc: Samuel Ortiz, aloisio.almeida@openbossa.org,
linville@tuxdriver.com, linux-wireless@vger.kernel.org
2011/9/19 Samuel Ortiz <samuel@sortiz.org>:
> Hi Ilan,
>
> On Tue, 2011-09-13 at 10:46 +0200, Elias, Ilan wrote:
>> 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>
> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Lauro
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-20 23:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-13 8:46 [PATCH v2 2/4] NFC: move nfc.h from include/net to include/net/nfc Elias, Ilan
2011-09-19 10:04 ` Samuel Ortiz
2011-09-19 12:12 ` Samuel Ortiz
2011-09-20 23:13 ` Lauro Ramos Venancio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).