From c5747fb47b35d945ab70c72ce30b771fcbcbcfe8 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 11 Aug 2011 22:38:12 +0200 Subject: [PATCH] --- yaml --- r: 267078 b: refs/heads/master c: ca123102f69fb260221502ade9bbc069290fae84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/power/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b87b9e0ac39b..22a50baa3bc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a77c46de1e3dace73745015635ebbc648eca69c +refs/heads/master: ca123102f69fb260221502ade9bbc069290fae84 diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index 2757acba8e8a..a52e88425a31 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -133,8 +133,6 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr, power_attr(pm_test); #endif /* CONFIG_PM_DEBUG */ -#endif /* CONFIG_PM_SLEEP */ - #ifdef CONFIG_DEBUG_FS static char *suspend_step_name(enum suspend_stat_step step) { @@ -230,6 +228,8 @@ static int __init pm_debugfs_init(void) late_initcall(pm_debugfs_init); #endif /* CONFIG_DEBUG_FS */ +#endif /* CONFIG_PM_SLEEP */ + struct kobject *power_kobj; /**