diff --git a/[refs] b/[refs] index 22eb95dda7ad..4d74a2148efe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e86d35c38e37eb64cb5d11933c42a2a72f16ce23 +refs/heads/master: 60b7bf4e61dd45e2fe06bd16ba04984405b564f1 diff --git a/trunk/drivers/hwmon/abx500.c b/trunk/drivers/hwmon/abx500.c index b4ad87b31a37..eee1134274c8 100644 --- a/trunk/drivers/hwmon/abx500.c +++ b/trunk/drivers/hwmon/abx500.c @@ -260,7 +260,7 @@ static ssize_t show_max_alarm(struct device *dev, return sprintf(buf, "%d\n", data->max_alarm[attr->index]); } -static mode_t abx500_attrs_visible(struct kobject *kobj, +static umode_t abx500_attrs_visible(struct kobject *kobj, struct attribute *attr, int n) { struct device *dev = container_of(kobj, struct device, kobj);