diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-27 13:40:08 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-27 13:40:08 +0200 |
commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /kernel/power/power.h | |
parent | ipcomp: Fix warnings after ipcomp consolidation. (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
download | linux-15d3b4a26291c170563e2b25ded5de1324f93959.tar.xz linux-15d3b4a26291c170563e2b25ded5de1324f93959.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/power/power.h')
-rw-r--r-- | kernel/power/power.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 700f44ec8406..acc0c101dbd5 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -53,8 +53,6 @@ extern int hibernation_platform_enter(void); extern int pfn_is_nosave(unsigned long); -extern struct mutex pm_mutex; - #define power_attr(_name) \ static struct kobj_attribute _name##_attr = { \ .attr = { \ |