From: Andrew Morton <akpm@linux-foundation.org>

kernel/power/main.c:123: warning: initialization from incompatible pointer type
kernel/power/main.c:123: warning: initialization from incompatible pointer type

Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/power/main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff -puN kernel/power/main.c~gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi kernel/power/main.c
--- a/kernel/power/main.c~gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi
+++ a/kernel/power/main.c
@@ -74,7 +74,8 @@ static const char * const pm_tests[__TES
 	[TEST_FREEZER] = "freezer",
 };
 
-static ssize_t pm_test_show(struct kset *kset, char *buf)
+static ssize_t pm_test_show(struct kobject *kobj, struct kobj_attribute *attr,
+				char *buf)
 {
 	char *s = buf;
 	int level;
@@ -94,7 +95,8 @@ static ssize_t pm_test_show(struct kset 
 	return (s - buf);
 }
 
-static ssize_t pm_test_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
+				const char *buf, size_t n)
 {
 	const char * const *s;
 	int level;
_