diff options
| author |   Mark Brown <broonie@kernel.org> | 2014-10-27 11:18:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-27 11:18:55 +0000 |
| commit | a7339126fdc6d94bc9deba0eaa751622c37b3948 (patch) | |
| tree | 39b2e2c4df03471ab764c4415c00727e623ee8c3 /include/linux/kernel.h | |
| parent | Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000 (diff) | |
| parent | Linux 3.18-rc2 (diff) | |
Merge tag 'v3.18-rc2' into asoc-sgtl5000
Linux 3.18-rc2
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 40728cf1c452..3d770f5564b8 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -403,6 +403,7 @@ int vsscanf(const char *, const char *, va_list); extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(const char *ptr, char **retptr); +extern bool parse_option_str(const char *str, const char *option); extern int core_kernel_text(unsigned long addr); extern int core_kernel_data(unsigned long addr); |