diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /include/linux/init.h | |
parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
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 |