diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 04:12:16 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 04:12:16 -0400 |
| commit | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (patch) | |
| tree | 77ab8003db1d6ccbcf3a9acafad26002fba37b63 /include/linux/init.h | |
| parent | b8c193f88ebd8705b3e916532539031cd9fc0b4c (diff) | |
| parent | 8c31813f31cd4403b46802866949a95a6e8fa584 (diff) | |
Merge branch 'sh/stable-updates' into sh/for-2.6.30
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 | /** |