---

yaml --- r: 326203 b: refs/heads/master c: f9b693e h: refs/heads/master i: 326201: ef4d700 326199: 4f048cd v: v3
git-mirror · Sep 24, 2012 · 73a6ea2 · 73a6ea2
1 parent 9469e6b
commit 73a6ea2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/include/linux/platform_data/sht15.h b/trunk/include/linux/sht15.h → trunk/include/linux/platform_data/sht15.h
@@ -31,4 +31,3 @@ struct sht15_platform_data {
 	bool no_otp_reload;
 	bool low_resolution;
 };
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@ struct sht15_platform_data {
		bool no_otp_reload;
		bool low_resolution;
		};