Commit 0f29c20b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'acpi-sysfs'

* acpi-sysfs:
  ACPI: sysfs: Fix pm_profile_attr type
parents 75b0cea7 e6d701dc
...@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void) ...@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void)
} }
static ssize_t static ssize_t
acpi_show_profile(struct device *dev, struct device_attribute *attr, acpi_show_profile(struct kobject *kobj, struct kobj_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile); return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile);
} }
static const struct device_attribute pm_profile_attr = static const struct kobj_attribute pm_profile_attr =
__ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL); __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
static ssize_t hotplug_enabled_show(struct kobject *kobj, static ssize_t hotplug_enabled_show(struct kobject *kobj,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment