This patch moves the sht15.h header from include/linux to include/linux/platform_data, and update existing support (stargate2 platform) accordingly.
Unified · Split
| @@ -52,7 +52,7 @@ · 51 unmodified lines | |||
| 52 | #include <linux/spi/spi.h> | 52 | #include <linux/spi/spi.h> |
| 53 | #include <linux/spi/pxa2xx_spi.h> | 53 | #include <linux/spi/pxa2xx_spi.h> |
| 54 | #include <linux/mfd/da903x.h> | 54 | #include <linux/mfd/da903x.h> |
| 55 | #include <linux/sht15.h> | 55 | #include <linux/platform_data/sht15.h> |
| 56 | 56 | ||
| 57 | #include "devices.h" | 57 | #include "devices.h" |
| 58 | #include "generic.h" | 58 | #include "generic.h" |
| @@ -24,12 +24,12 @@ · 23 unmodified lines | |||
| 24 | #include <linux/hwmon.h> | 24 | #include <linux/hwmon.h> |
| 25 | #include <linux/hwmon-sysfs.h> | 25 | #include <linux/hwmon-sysfs.h> |
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | #include <linux/platform_data/sht15.h> | ||
| 27 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 28 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 29 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 30 | #include <linux/jiffies.h> | 31 | #include <linux/jiffies.h> |
| 31 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 32 | #include <linux/sht15.h> | ||
| 33 | #include <linux/regulator/consumer.h> | 33 | #include <linux/regulator/consumer.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/atomic.h> | 35 | #include <linux/atomic.h> |
| @@ -31,4 +31,3 @@ struct sht15_platform_data { · 30 unmodified lines | |||
| 31 | bool no_otp_reload; | 31 | bool no_otp_reload; |
| 32 | bool low_resolution; | 32 | bool low_resolution; |
| 33 | }; | 33 | }; |
| 34 | |||