Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/mach-omap1/pm.c               |    2 +-
 arch/powerpc/platforms/pseries/power.c |   10 +++++-----
 include/linux/kobject.h                |    4 ++--
 kernel/power/disk.c                    |    2 +-
 kernel/power/main.c                    |    8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff -puN arch/arm/mach-omap1/pm.c~gregkh-driver-driver-core-make-sys-power-a-kobject arch/arm/mach-omap1/pm.c
--- a/arch/arm/mach-omap1/pm.c~gregkh-driver-driver-core-make-sys-power-a-kobject
+++ a/arch/arm/mach-omap1/pm.c
@@ -719,7 +719,7 @@ static int __init omap_pm_init(void)
 	omap_pm_init_proc();
 #endif
 
-	error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr);
+	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr);
 	if (error)
 		printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
 
diff -puN arch/powerpc/platforms/pseries/power.c~gregkh-driver-driver-core-make-sys-power-a-kobject arch/powerpc/platforms/pseries/power.c
--- a/arch/powerpc/platforms/pseries/power.c~gregkh-driver-driver-core-make-sys-power-a-kobject
+++ a/arch/powerpc/platforms/pseries/power.c
@@ -53,7 +53,7 @@ static struct kobj_attribute auto_powero
 	__ATTR(auto_poweron, 0644, auto_poweron_show, auto_poweron_store);
 
 #ifndef CONFIG_PM
-struct kset *power_kset;
+struct kobject *power_kobj;
 
 static struct attribute *g[] = {
         &auto_poweron_attr.attr,
@@ -66,16 +66,16 @@ 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);
 #else
 static int __init apo_pm_init(void)
 {
-	return (sysfs_create_file(&power_kset->kobj, &auto_poweron_attr));
+	return (sysfs_create_file(power_kobj, &auto_poweron_attr));
 }
 __initcall(apo_pm_init);
 #endif
diff -puN include/linux/kobject.h~gregkh-driver-driver-core-make-sys-power-a-kobject include/linux/kobject.h
--- a/include/linux/kobject.h~gregkh-driver-driver-core-make-sys-power-a-kobject
+++ a/include/linux/kobject.h
@@ -202,8 +202,8 @@ extern struct kobject * kset_find_obj(st
 extern struct kobject *kernel_kobj;
 /* The global /sys/hypervisor/ kobject for people to chain off of */
 extern struct kobject *hypervisor_kobj;
-/* The global /sys/power/ kset for people to chain off of */
-extern struct kset *power_kset;
+/* The global /sys/power/ kobject for people to chain off of */
+extern struct kobject *power_kobj;
 /* The global /sys/firmware/ kobject for people to chain off of */
 extern struct kobject *firmware_kobj;
 
diff -puN kernel/power/disk.c~gregkh-driver-driver-core-make-sys-power-a-kobject kernel/power/disk.c
--- a/kernel/power/disk.c~gregkh-driver-driver-core-make-sys-power-a-kobject
+++ a/kernel/power/disk.c
@@ -808,7 +808,7 @@ static struct attribute_group attr_group
 
 static int __init pm_disk_init(void)
 {
-	return sysfs_create_group(&power_kset->kobj, &attr_group);
+	return sysfs_create_group(power_kobj, &attr_group);
 }
 
 core_initcall(pm_disk_init);
diff -puN kernel/power/main.c~gregkh-driver-driver-core-make-sys-power-a-kobject kernel/power/main.c
--- a/kernel/power/main.c~gregkh-driver-driver-core-make-sys-power-a-kobject
+++ a/kernel/power/main.c
@@ -390,7 +390,7 @@ EXPORT_SYMBOL(pm_suspend);
 
 #endif /* CONFIG_SUSPEND */
 
-struct kset *power_kset;
+struct kobject *power_kobj;
 
 /**
  *	state - control system power state.
@@ -503,10 +503,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);
_