summaryrefslogtreecommitdiff
path: root/include/uapi/linux/string.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
commit2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch)
tree2eb2819e880060486d36665113e8da5c460383fc /include/uapi/linux/string.h
parent6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff)
parent8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff)
Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm2200
regmap: Range API changes A bunch of updates to the regmap range support, the most important ones being to rename "n_ranges" to "num_ranges" for consistency and to allow block writes to cross page boundaries, making things more transparent.
Diffstat (limited to 'include/uapi/linux/string.h')
-rw-r--r--include/uapi/linux/string.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/string.h b/include/uapi/linux/string.h
new file mode 100644
index 000000000000..e32e545cff5a
--- /dev/null
+++ b/include/uapi/linux/string.h
@@ -0,0 +1,9 @@
+#ifndef _UAPI_LINUX_STRING_H_
+#define _UAPI_LINUX_STRING_H_
+
+/* We don't want strings.h stuff being used by user stuff by accident */
+
+#ifndef __KERNEL__
+#include <string.h>
+#endif /* __KERNEL__ */
+#endif /* _UAPI_LINUX_STRING_H_ */