Merge branch 'acpica' into release

[firefly-linux-kernel-4.4.55.git] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index b8508868d5ad428ab0c220ee2b39296e92eceb89..651839a2a755ffa63aa862367fb502897df94e3c 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -62,7 +62,15 @@ extern char * strnchr(const char *, size_t, int);
 #ifndef __HAVE_ARCH_STRRCHR
 extern char * strrchr(const char *,int);
 #endif
-extern char * __must_check strstrip(char *);
+extern char * __must_check skip_spaces(const char *);
+
+extern char *strim(char *);
+
+static inline __must_check char *strstrip(char *str)
+{
+       return strim(str);
+}
+
 #ifndef __HAVE_ARCH_STRSTR
 extern char * strstr(const char *,const char *);
 #endif