Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=039a75c6e17ba4ff76998d6ac6ee3d508fff1930
Commit: 039a75c6e17ba4ff76998d6ac6ee3d508fff1930
Parent: 0e7d56e3d9d7e37c79d0e05ffb3994e34beb3bbc
Author: Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 29 00:29:06 2008 +0100
Committer: Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 18:30:54 2008 -0500
suspend: build fix responding to 2.6.25 kset change
Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
kernel/power/main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 84e1ae6..fc717b8 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
