diff options
| author |   Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
| commit | aa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch) | |
| tree | 9b0b791d5912368006115427e74105cfe26750bd /drivers/hwmon/amc6821.c | |
| parent | netlabel: shorter names for the NetLabel catmap funcs/structs (diff) | |
| parent | Linux 3.16 (diff) | |
| download | linux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.tar.xz linux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.zip | |
Merge tag 'v3.16' into next
Linux 3.16
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); |