diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /drivers/hwmon/abx500.c | |
| parent | spi: Use dev_get_drvdata at appropriate places (diff) | |
| parent | spi: spi-rspi: fix inconsistent spin_lock_irqsave (diff) | |
| download | linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.xz linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/hwmon/abx500.c')
| -rw-r--r-- | drivers/hwmon/abx500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/abx500.c b/drivers/hwmon/abx500.c index eee1134274c8..769fe20ec938 100644 --- a/drivers/hwmon/abx500.c +++ b/drivers/hwmon/abx500.c @@ -315,7 +315,7 @@ static SENSOR_DEVICE_ATTR(temp4_max_hyst, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR(temp4_min_alarm, S_IRUGO, show_min_alarm, NULL, 3); static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO, show_max_alarm, NULL, 3); -struct attribute *abx500_temp_attributes[] = { +static struct attribute *abx500_temp_attributes[] = { &sensor_dev_attr_name.dev_attr.attr, &sensor_dev_attr_temp1_label.dev_attr.attr, |