diff --git a/[refs] b/[refs] index a6df1f837925..e8bb446e663b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c333aaf4b2d6a83d9e8d6247584af8c18c4d7b +refs/heads/master: bde9e5098c121cfca6d9c7e3a26e6ae44a3c9632 diff --git a/trunk/drivers/platform/x86/samsung-laptop.c b/trunk/drivers/platform/x86/samsung-laptop.c index d1142e317433..4787afdf11dc 100644 --- a/trunk/drivers/platform/x86/samsung-laptop.c +++ b/trunk/drivers/platform/x86/samsung-laptop.c @@ -1087,7 +1087,7 @@ static int __init samsung_backlight_init(struct samsung_laptop *samsung) return 0; } -static mode_t samsung_sysfs_is_visible(struct kobject *kobj, +static umode_t samsung_sysfs_is_visible(struct kobject *kobj, struct attribute *attr, int idx) { struct device *dev = container_of(kobj, struct device, kobj);