diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:27:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:27:47 -0400 |
| commit | c4c0c56a7a85ed5725786219e4fbca7e840b1531 (patch) | |
| tree | c9d6b35a571fd5e80ddf5bf4a60142480eaa18d8 /kernel/power/power.h | |
| parent | 5127bed588a2f8f3a1f732de2a8a190b7df5dce3 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into core/rcu
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); | |||
| 53 | 53 | ||
| 54 | extern int pfn_is_nosave(unsigned long); | 54 | extern int pfn_is_nosave(unsigned long); |
| 55 | 55 | ||
| 56 | extern struct mutex pm_mutex; | ||
| 57 | |||
| 58 | #define power_attr(_name) \ | 56 | #define power_attr(_name) \ |
| 59 | static struct kobj_attribute _name##_attr = { \ | 57 | static struct kobj_attribute _name##_attr = { \ |
| 60 | .attr = { \ | 58 | .attr = { \ |