mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
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()
This commit is contained in:
commit
529e89430d
3 changed files with 41 additions and 15 deletions
|
|
@ -149,6 +149,8 @@ void prepare_namespace(void);
|
|||
|
||||
extern void (*late_time_init)(void);
|
||||
|
||||
extern int initcall_debug;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef MODULE
|
||||
|
|
|
|||
Loading…
Reference in a new issue