aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/disk.c2
-rw-r--r--kernel/power/main.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index ef5aa2ca0ab0..b138b431e271 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -714,7 +714,7 @@ static struct attribute_group attr_group = {
714 714
715static int __init pm_disk_init(void) 715static int __init pm_disk_init(void)
716{ 716{
717 return sysfs_create_group(&power_kset->kobj, &attr_group); 717 return sysfs_create_group(power_kobj, &attr_group);
718} 718}
719 719
720core_initcall(pm_disk_init); 720core_initcall(pm_disk_init);
diff --git a/kernel/power/main.c b/kernel/power/main.c
index b8139493b856..efc08360e627 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -276,7 +276,7 @@ EXPORT_SYMBOL(pm_suspend);
276 276
277#endif /* CONFIG_SUSPEND */ 277#endif /* CONFIG_SUSPEND */
278 278
279struct kset *power_kset; 279struct kobject *power_kobj;
280 280
281/** 281/**
282 * state - control system power state. 282 * state - control system power state.
@@ -389,10 +389,10 @@ static struct attribute_group attr_group = {
389 389
390static int __init pm_init(void) 390static int __init pm_init(void)
391{ 391{
392 power_kset = kset_create_and_add("power", NULL, NULL); 392 power_kobj = kobject_create_and_add("power", NULL);
393 if (!power_kset) 393 if (!power_kobj)
394 return -ENOMEM; 394 return -ENOMEM;
395 return sysfs_create_group(&power_kset->kobj, &attr_group); 395 return sysfs_create_group(power_kobj, &attr_group);
396} 396}
397 397
398core_initcall(pm_init); 398core_initcall(pm_init);