summaryrefslogtreecommitdiff
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-27 11:28:26 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:25 -0800
commitd76e15fb20eeb7632ef38876a884fe3508b2c01d (patch)
tree5f3d63e70d8ac2365ee0c3f6b0489c8377ec1cd0 /kernel/power/main.c
parent37b0c020343080241984d978981d6caf877b278a (diff)
driver core: make /sys/power a kobject
/sys/power should not be a kset, that's overkill. This patch renames it to power_kset and fixes up all usages of it in the tree. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r--kernel/power/main.c8
1 files changed, 4 insertions, 4 deletions
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);
#endif /* CONFIG_SUSPEND */
-struct kset *power_kset;
+struct kobject *power_kobj;
/**
* state - control system power state.
@@ -389,10 +389,10 @@ static struct attribute_group attr_group = {
static int __init pm_init(void)
{
- power_kset = kset_create_and_add("power", NULL, NULL);
- if (!power_kset)
+ power_kobj = kobject_create_and_add("power", NULL);
+ if (!power_kobj)
return -ENOMEM;
- return sysfs_create_group(&power_kset->kobj, &attr_group);
+ return sysfs_create_group(power_kobj, &attr_group);
}
core_initcall(pm_init);