diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 15:03:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 15:03:03 -0500 |
| commit | 529e89430d6c0d64db8ac474cb95e68e2527c79a (patch) | |
| tree | 0407825d29351d04474b3a1294f2b4d42a1e8e03 /include | |
| parent | 61ecdb84c1f05ad445db4584ae375a15c0e8ae47 (diff) | |
| parent | d8bed5a4f343d1826153ecf8e7932126c757a21d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: rwsem.h need not be included into main.c
PM: Remove unnecessary goto from device_resume_noirq()
PM: Add initcall_debug style timing for suspend/resume
PM: allow for usage_count > 0 in pm_runtime_get()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/init.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ff8bde520d0..ab1d31f9352 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -149,6 +149,8 @@ void prepare_namespace(void); | |||
| 149 | 149 | ||
| 150 | extern void (*late_time_init)(void); | 150 | extern void (*late_time_init)(void); |
| 151 | 151 | ||
| 152 | extern int initcall_debug; | ||
| 153 | |||
| 152 | #endif | 154 | #endif |
| 153 | 155 | ||
| 154 | #ifndef MODULE | 156 | #ifndef MODULE |