Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 039a75c6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

suspend: build fix responding to 2.6.25 kset change 



Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0e7d56e3

kernel/power/main.c

+5 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static const char * const pm_tests[__TEST_AFTER_LAST] = { 
	[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;
@@ -73,7 +74,8 @@ static ssize_t pm_test_show(struct kset *kset, char *buf) 
	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;
@@ -104,6 +106,7 @@ power_attr(pm_test); 
static inline int suspend_test(int level) { return 0; }

#endif /* !CONFIG_PM_DEBUG */





#ifdef CONFIG_SUSPEND



/* This is just an arbitrary number */