summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2012-10-24 11:45:26 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2012-11-19 23:56:59 +0100
commit61cdb01853c99e78d8b54db1b77e524c0dce585d (patch)
tree93cdb48a3f569a39deb9a98a117bbcab308d9d56
parentd962ec4922493da48bb0fd33b26200de039b0d75 (diff)
downloadlinux-61cdb01853c99e78d8b54db1b77e524c0dce585d.tar.gz
linux-61cdb01853c99e78d8b54db1b77e524c0dce585d.tar.bz2
linux-61cdb01853c99e78d8b54db1b77e524c0dce585d.zip
NFC: Move pn544.h to linux/platform_data/
The pn544.h just provides the platform data struct and defines and nothing else. So move it to to linux/platform_data/ now. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/pn544/i2c.c2
-rw-r--r--include/linux/platform_data/pn544.h (renamed from include/linux/nfc/pn544.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index fb430d882352..7da9071b68b6 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/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/include/linux/nfc/pn544.h b/include/linux/platform_data/pn544.h
index 713bfd703342..713bfd703342 100644
--- a/include/linux/nfc/pn544.h
+++ b/include/linux/platform_data/pn544.h