summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-01-29 00:29:06 +0100
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:54 -0500
commit039a75c6e17ba4ff76998d6ac6ee3d508fff1930 (patch)
tree050ce0df5ae0a7e823b2ceb4dec40e85fb5c987c /kernel/power
parent0e7d56e3d9d7e37c79d0e05ffb3994e34beb3bbc (diff)
downloadlinux-039a75c6e17ba4ff76998d6ac6ee3d508fff1930.tar.bz2
suspend: build fix responding to 2.6.25 kset change
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 84e1ae63bb8c..fc717b836828 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 */