diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2012-09-12 12:23:44 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 00:08:35 -0400 |
commit | f9b693eb3db8b8cbcd34e0d3874e0252271f7204 (patch) | |
tree | b923dcc582b8d5a4a4eec91278cb651bd5e2797c | |
parent | 8494df3aa65a110cfa756177fa6dc560322a7ab6 (diff) |
hwmon: (sht15) move header to linux/platform_data/
This patch moves the sht15.h header from include/linux to
include/linux/platform_data, and update existing support (stargate2
platform) accordingly.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | arch/arm/mach-pxa/stargate2.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/sht15.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/sht15.h (renamed from include/linux/sht15.h) | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 30b1b0b3c7f7..0701ca79e7d3 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c | |||
@@ -52,7 +52,7 @@ | |||
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" |
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index c8245c01fd53..07a0c1a0b84d 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c | |||
@@ -24,12 +24,12 @@ | |||
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> |
diff --git a/include/linux/sht15.h b/include/linux/platform_data/sht15.h index f85c7c523da0..33e0fd27225e 100644 --- a/include/linux/sht15.h +++ b/include/linux/platform_data/sht15.h | |||
@@ -31,4 +31,3 @@ struct sht15_platform_data { | |||
31 | bool no_otp_reload; | 31 | bool no_otp_reload; |
32 | bool low_resolution; | 32 | bool low_resolution; |
33 | }; | 33 | }; |
34 | |||