diff options
| author |   Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 15:10:58 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 15:10:58 +0800 |
| commit | 8f71fb87e288c5f374ea0e0ddac18707b6649f72 (patch) | |
| tree | dd77032ddcfcfe995436031281eb008a471cfc30 /include/linux/string.h | |
| parent | Linux 3.6-rc2 (diff) | |
| parent | ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog' (diff) | |
Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index ffe0442e18d2..b9178812d9df 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -144,8 +144,8 @@ static inline bool strstarts(const char *str, const char *prefix) { return strncmp(str, prefix, strlen(prefix)) == 0; } -#endif extern size_t memweight(const void *ptr, size_t bytes); +#endif /* __KERNEL__ */ #endif /* _LINUX_STRING_H_ */ |