summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-29 19:12:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-29 19:12:35 -0700
commite4e98c460ad38c78498622a164fd5ef09a2dc9cb (patch)
tree72d4fb1100333ee7d736bd5bd73d3d0af7e3b470 /drivers
parentb8927721ae9d5ac0582d29d7b8c267d465ad5f00 (diff)
parent3c3292634fc2de1ab97b6aa3222fee647f737adb (diff)
downloadtalos-op-linux-e4e98c460ad38c78498622a164fd5ef09a2dc9cb.tar.gz
talos-op-linux-e4e98c460ad38c78498622a164fd5ef09a2dc9cb.zip
Merge tag 'hwmon-for-linus-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck: "Add missing sysfs attribute group terminator to it87 driver" * tag 'hwmon-for-linus-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (it87) Add missing sysfs attribute group terminator
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/it87.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index d0203a115eff..4667012b46b7 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -2015,6 +2015,7 @@ static struct attribute *it87_attributes_in[] = {
&sensor_dev_attr_in10_input.dev_attr.attr, /* 41 */
&sensor_dev_attr_in11_input.dev_attr.attr, /* 41 */
&sensor_dev_attr_in12_input.dev_attr.attr, /* 41 */
+ NULL
};
static const struct attribute_group it87_group_in = {
OpenPOWER on IntegriCloud