diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 21:24:18 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 21:24:18 +0200 |
commit | a7a30232df01db886473324050d79c3122937c78 (patch) | |
tree | 76323b745b44b792173575843a72a2f6baa8a6da /drivers/hwmon/amc6821.c | |
parent | video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes (diff) | |
parent | ARM: EXYNOS: Add support for mapping PMU base address via DT (diff) | |
download | linux-a7a30232df01db886473324050d79c3122937c78.tar.xz linux-a7a30232df01db886473324050d79c3122937c78.zip |
Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/dt-s5pv210
Diffstat (limited to 'drivers/hwmon/amc6821.c')
-rw-r--r-- | drivers/hwmon/amc6821.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c index eea817296513..9f2be3dd28f3 100644 --- a/drivers/hwmon/amc6821.c +++ b/drivers/hwmon/amc6821.c @@ -704,7 +704,7 @@ static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, get_temp_alarm, NULL, IDX_TEMP1_MAX); static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, get_temp_alarm, NULL, IDX_TEMP1_CRIT); -static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO | S_IWUSR, +static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, get_temp, NULL, IDX_TEMP2_INPUT); static SENSOR_DEVICE_ATTR(temp2_min, S_IRUGO | S_IWUSR, get_temp, set_temp, IDX_TEMP2_MIN); |