diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 22:15:56 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 22:15:56 +0100 |
| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a /include/linux/kernel.h | |
| parent | fe82dcec644244676d55a1384c958d5f67979adb (diff) | |
| parent | 7efe665903d0d963b0ebf4cab25cc3ae32c62600 (diff) | |
| download | op-kernel-dev-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.zip op-kernel-dev-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.gz | |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
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 95624be..f66427e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -407,6 +407,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); |
