From 73a6ea20191f42c9ce60e922873743ebeadfcc3a Mon Sep 17 00:00:00 2001
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Wed, 12 Sep 2012 12:23:44 -0400
Subject: [PATCH] --- yaml --- r: 326203 b: refs/heads/master c:
 f9b693eb3db8b8cbcd34e0d3874e0252271f7204 h: refs/heads/master i:   326201:
 ef4d700886c910d0513992eff57c5bb6496c8157   326199:
 4f048cd65d530b1dbd82733ac864d8241adf9cf6 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-pxa/stargate2.c             | 2 +-
 trunk/drivers/hwmon/sht15.c                     | 2 +-
 trunk/include/linux/{ => platform_data}/sht15.h | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename trunk/include/linux/{ => platform_data}/sht15.h (99%)

diff --git a/[refs] b/[refs]
index eebfd0639f4e..d6ee0894ba07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8494df3aa65a110cfa756177fa6dc560322a7ab6
+refs/heads/master: f9b693eb3db8b8cbcd34e0d3874e0252271f7204
diff --git a/trunk/arch/arm/mach-pxa/stargate2.c b/trunk/arch/arm/mach-pxa/stargate2.c
index 30b1b0b3c7f7..0701ca79e7d3 100644
--- a/trunk/arch/arm/mach-pxa/stargate2.c
+++ b/trunk/arch/arm/mach-pxa/stargate2.c
@@ -52,7 +52,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/mfd/da903x.h>
-#include <linux/sht15.h>
+#include <linux/platform_data/sht15.h>
 
 #include "devices.h"
 #include "generic.h"
diff --git a/trunk/drivers/hwmon/sht15.c b/trunk/drivers/hwmon/sht15.c
index c8245c01fd53..07a0c1a0b84d 100644
--- a/trunk/drivers/hwmon/sht15.c
+++ b/trunk/drivers/hwmon/sht15.c
@@ -24,12 +24,12 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/mutex.h>
+#include <linux/platform_data/sht15.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/err.h>
-#include <linux/sht15.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/atomic.h>
diff --git a/trunk/include/linux/sht15.h b/trunk/include/linux/platform_data/sht15.h
similarity index 99%
rename from trunk/include/linux/sht15.h
rename to trunk/include/linux/platform_data/sht15.h
index f85c7c523da0..33e0fd27225e 100644
--- a/trunk/include/linux/sht15.h
+++ b/trunk/include/linux/platform_data/sht15.h
@@ -31,4 +31,3 @@ struct sht15_platform_data {
 	bool no_otp_reload;
 	bool low_resolution;
 };
-