summaryrefslogtreecommitdiff
path: root/include/uapi/linux/string.h
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-16 13:30:09 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-16 13:30:09 +0300
commite7d9facf0bab6d919342fea17c8cc0f65f8a0fe9 (patch)
tree8301035b4dcb273c211c04fe2c0d1cbaf897021b /include/uapi/linux/string.h
parent28bcd199cc4465733c1ac0c70135a385fff97c71 (diff)
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
Merge tag 'v3.7-rc1'
Merge Linux 3.7-rc1 to get latest upstream changes.
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_ */