diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /include/linux/init.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 6667785dd1ff..e92b1455d7af 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -68,6 +68,7 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[]; | |||
| 68 | 68 | ||
| 69 | /* Defined in init/main.c */ | 69 | /* Defined in init/main.c */ |
| 70 | extern char saved_command_line[]; | 70 | extern char saved_command_line[]; |
| 71 | extern unsigned int reset_devices; | ||
| 71 | 72 | ||
| 72 | /* used by init/main.c */ | 73 | /* used by init/main.c */ |
| 73 | extern void setup_arch(char **); | 74 | extern void setup_arch(char **); |