diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
| commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
| tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /include/linux/init.h | |
| parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
| parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ff8d8b8632f4..ed0ac7c39fdc 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -69,6 +69,10 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[]; | |||
| 69 | 69 | ||
| 70 | /* Defined in init/main.c */ | 70 | /* Defined in init/main.c */ |
| 71 | extern char saved_command_line[]; | 71 | extern char saved_command_line[]; |
| 72 | |||
| 73 | /* used by init/main.c */ | ||
| 74 | extern void setup_arch(char **); | ||
| 75 | |||
| 72 | #endif | 76 | #endif |
| 73 | 77 | ||
| 74 | #ifndef MODULE | 78 | #ifndef MODULE |