summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-11-26 03:48:18 +0000
committerJason Cooper <jason@lakedaemon.net>2014-11-26 03:48:18 +0000
commitb3d6cfd09184dcea17f7d8e29c71fafe58bb5f00 (patch)
tree8be4c2cc6caf1e7a5d31401f3f2e960110df6ebd /include/linux/kernel.h
parent389c74aaace1ae2a423184b03d8198311fef2c7d (diff)
parent2fbbc96d16009276153fd33823616877dcca30d8 (diff)
Merge tag 'tags/phy-dt-header' into mvebu/dt-usb_phy
shared header file which will be referenced from both PHY driver and its associated Device Tree node(s)
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
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);