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

Merge branch 'acpi-sysfs' 

* acpi-sysfs:
  ACPI: sysfs: Fix pm_profile_attr type
parents 75b0cea7 e6d701dc

drivers/acpi/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void) 
}



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)

{

	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);



static ssize_t hotplug_enabled_show(struct kobject *kobj,