From 95e4302652f0b7f4bd6d9a120708a9b3fd272b6d Mon Sep 17 00:00:00 2001 From: Ilan Elias Date: Sun, 18 Sep 2011 11:19:34 +0300 Subject: [PATCH] --- yaml --- r: 266299 b: refs/heads/master c: 55eb94f9e923cba376cdf48ea5ab28d81116bead h: refs/heads/master i: 266297: 31d719d8096c447c16ac76a929c9561e5aa4b9d4 266295: b2a4df640ac56b9a42535dad13c368fdc1eb26b0 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/nfc/pn533.c | 2 +- trunk/include/net/{ => nfc}/nfc.h | 0 trunk/net/nfc/nfc.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename trunk/include/net/{ => nfc}/nfc.h (100%) diff --git a/[refs] b/[refs] index 655330cb2243..96946c3f68f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b3fe7b591b3c50061a8701f8eda14033420577b +refs/heads/master: 55eb94f9e923cba376cdf48ea5ab28d81116bead diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ce0e60c7b07a..1789ce22ea8c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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 diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c index c78eb6afd0cb..7bcb1febef0d 100644 --- a/trunk/drivers/nfc/pn533.c +++ b/trunk/drivers/nfc/pn533.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #define VERSION "0.1" diff --git a/trunk/include/net/nfc.h b/trunk/include/net/nfc/nfc.h similarity index 100% rename from trunk/include/net/nfc.h rename to trunk/include/net/nfc/nfc.h diff --git a/trunk/net/nfc/nfc.h b/trunk/net/nfc/nfc.h index 1a877de8e230..b6753f45624e 100644 --- a/trunk/net/nfc/nfc.h +++ b/trunk/net/nfc/nfc.h @@ -24,7 +24,7 @@ #ifndef __LOCAL_NFC_H #define __LOCAL_NFC_H -#include +#include #include __attribute__((format (printf, 2, 3)))