diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/init.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 fb58c0493cf2..21d658cdfa27 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -147,6 +147,8 @@ extern unsigned int reset_devices; | |||
| 147 | void setup_arch(char **); | 147 | void setup_arch(char **); |
| 148 | void prepare_namespace(void); | 148 | void prepare_namespace(void); |
| 149 | 149 | ||
| 150 | extern void (*late_time_init)(void); | ||
| 151 | |||
| 150 | #endif | 152 | #endif |
| 151 | 153 | ||
| 152 | #ifndef MODULE | 154 | #ifndef MODULE |