aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-12-27 11:40:13 +0530
committerGuenter Roeck <linux@roeck-us.net>2014-01-14 21:36:52 -0800
commit2ac1dfc52dc862eabf30d5ece51f3422e6df561a (patch)
tree3bd89961c278a1137a26c84875d5022b92ccaa85 /include/linux
parenthwmon: (coretemp) Do not return -EAGAIN for low temperatures (diff)
downloadlinux-dev-2ac1dfc52dc862eabf30d5ece51f3422e6df561a.tar.xz
linux-dev-2ac1dfc52dc862eabf30d5ece51f3422e6df561a.zip
hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions") moved the file to the current location but forgot to remove the pointer to its previous location. Clean it up. While at it also change the header file protection macros appropriately. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/platform_data/hwmon-s3c.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/platform_data/hwmon-s3c.h b/include/linux/platform_data/hwmon-s3c.h
index c167e4429bc7..0e3cce130fe2 100644
--- a/include/linux/platform_data/hwmon-s3c.h
+++ b/include/linux/platform_data/hwmon-s3c.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s3c/include/plat/hwmon.h
- *
+/*
* Copyright 2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
@@ -11,8 +10,8 @@
* published by the Free Software Foundation.
*/
-#ifndef __ASM_ARCH_ADC_HWMON_H
-#define __ASM_ARCH_ADC_HWMON_H __FILE__
+#ifndef __HWMON_S3C_H__
+#define __HWMON_S3C_H__
/**
* s3c_hwmon_chcfg - channel configuration
@@ -47,5 +46,4 @@ struct s3c_hwmon_pdata {
*/
extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd);
-#endif /* __ASM_ARCH_ADC_HWMON_H */
-
+#endif /* __HWMON_S3C_H__ */