Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55eb94f9 authored Sep 18, 2011 by Ilan Elias Committed by John W. Linville Sep 20, 2011

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>

parent 8b3fe7b5

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

drivers/nfc/pn533.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

include/net/nfc.h→include/net/nfc/nfc.h

+0 −0

File moved.

net/nfc/nfc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)))