From 7e640803610ca889841e1de595bc8439e39619cc Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 24 Oct 2012 11:45:26 -0700
Subject: [PATCH] --- yaml --- r: 341506 b: refs/heads/master c:
 61cdb01853c99e78d8b54db1b77e524c0dce585d h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/nfc/pn544/i2c.c                      | 2 +-
 trunk/include/linux/{nfc => platform_data}/pn544.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename trunk/include/linux/{nfc => platform_data}/pn544.h (100%)

diff --git a/[refs] b/[refs]
index a21d9720ecf1..70f5e0303e14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d962ec4922493da48bb0fd33b26200de039b0d75
+refs/heads/master: 61cdb01853c99e78d8b54db1b77e524c0dce585d
diff --git a/trunk/drivers/nfc/pn544/i2c.c b/trunk/drivers/nfc/pn544/i2c.c
index fb430d882352..7da9071b68b6 100644
--- a/trunk/drivers/nfc/pn544/i2c.c
+++ b/trunk/drivers/nfc/pn544/i2c.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
-#include <linux/nfc/pn544.h>
+#include <linux/platform_data/pn544.h>
 
 #include <net/nfc/hci.h>
 #include <net/nfc/llc.h>
diff --git a/trunk/include/linux/nfc/pn544.h b/trunk/include/linux/platform_data/pn544.h
similarity index 100%
rename from trunk/include/linux/nfc/pn544.h
rename to trunk/include/linux/platform_data/pn544.h