diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-06-29 12:15:51 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-06-29 12:16:26 +0200 |
| commit | 60e9eabf41fa916d2ef68c5bf929197975917578 (patch) | |
| tree | 39ce456390ed34d2624aed1260203f43fff94d38 /include/linux/parser.h | |
| parent | 84e543bc9d1dc550132ba25b72df28d40cc44333 (diff) | |
| parent | 0a19b068acc47d05212f03e494381926dc0381e2 (diff) | |
| download | cachepc-linux-60e9eabf41fa916d2ef68c5bf929197975917578.tar.gz cachepc-linux-60e9eabf41fa916d2ef68c5bf929197975917578.zip | |
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/parser.h')
| -rw-r--r-- | include/linux/parser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h index 12fc3482f5fc..89e2b23fb888 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -7,7 +7,8 @@ * but could potentially be used anywhere else that simple option=arg * parsing is required. */ - +#ifndef _LINUX_PARSER_H +#define _LINUX_PARSER_H /* associates an integer enumerator with a pattern string. */ struct match_token { @@ -34,3 +35,5 @@ int match_hex(substring_t *, int *result); bool match_wildcard(const char *pattern, const char *str); size_t match_strlcpy(char *, const substring_t *, size_t); char *match_strdup(const substring_t *); + +#endif /* _LINUX_PARSER_H */ |