diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 30b1b0b3c7f7cd26dbd53732aca076ce873f29db..0701ca79e7d3ff2011913fd48326b8788263e36a 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/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/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index c8245c01fd533624ca378b9276b1bc7a00bd2667..07a0c1a0b84db29410943f7d4db77eaaf93fc1d2 100644
--- a/drivers/hwmon/sht15.c
+++ b/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/include/linux/sht15.h b/include/linux/platform_data/sht15.h
similarity index 99%
rename from include/linux/sht15.h
rename to include/linux/platform_data/sht15.h
index f85c7c523da0f6b8222ab6e1c56cf4e4701acfbc..33e0fd27225e03a06aac63e08de8cfb36adb49fc 100644
--- a/include/linux/sht15.h
+++ b/include/linux/platform_data/sht15.h
@@ -31,4 +31,3 @@ struct sht15_platform_data {
 	bool no_otp_reload;
 	bool low_resolution;
 };
-