adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

suspend: build fix responding to 2.6.25 kset change

Browse source 
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Rafael J. Wysocki 2008-01-29 00:29:06 +01:00 committed by Len Brown
parent 0e7d56e3d9
commit 039a75c6e1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/power/main.c
View file

@ -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 */