diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /include/linux/string.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
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 810d80df0a1d..d18fc198aa2f 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _LINUX_STRING_H_ | 1 | #ifndef _LINUX_STRING_H_ |
| 2 | #define _LINUX_STRING_H_ | 2 | #define _LINUX_STRING_H_ |
| 3 | 3 | ||
| 4 | /* We don't want strings.h stuff being user by user stuff by accident */ | 4 | /* We don't want strings.h stuff being used by user stuff by accident */ |
| 5 | 5 | ||
| 6 | #ifndef __KERNEL__ | 6 | #ifndef __KERNEL__ |
| 7 | #include <string.h> | 7 | #include <string.h> |