Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267078
b: refs/heads/master
c: ca12310
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki committed Oct 16, 2011
1 parent e10c5de commit c5747fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a77c46de1e3dace73745015635ebbc648eca69c
refs/heads/master: ca123102f69fb260221502ade9bbc069290fae84
4 changes: 2 additions & 2 deletions trunk/kernel/power/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;

/**
Expand Down

0 comments on commit c5747fb

Please sign in to comment.