diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/init.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/init.h')
| -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 ff8bde520d03..ab1d31f9352b 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 |