diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-18 20:32:36 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-18 20:32:36 +0200 |
commit | 5d88d15e932ea98862c1008a4db3ae9dfac2932a (patch) | |
tree | 9faae1def638647dc0aaee9f8dfa7fc2a989cdf9 /drivers/hwmon | |
parent | Merge branch 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | hwmon: (abx500) Staticize abx500_temp_attributes (diff) | |
download | linux-5d88d15e932ea98862c1008a4db3ae9dfac2932a.tar.xz linux-5d88d15e932ea98862c1008a4db3ae9dfac2932a.zip |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Single patch to staticize a local variable"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (abx500) Staticize abx500_temp_attributes
Diffstat (limited to 'drivers/hwmon')
-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, |