diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /include/linux/init.h | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 68cb0265d009..f121a7a10c3d 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -247,6 +247,7 @@ struct obs_kernel_param { | |||
| 247 | 247 | ||
| 248 | /* Relies on boot_command_line being set */ | 248 | /* Relies on boot_command_line being set */ |
| 249 | void __init parse_early_param(void); | 249 | void __init parse_early_param(void); |
| 250 | void __init parse_early_options(char *cmdline); | ||
| 250 | #endif /* __ASSEMBLY__ */ | 251 | #endif /* __ASSEMBLY__ */ |
| 251 | 252 | ||
| 252 | /** | 253 | /** |