diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /include/asm-s390/debug.h | |
parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-s390/debug.h')
-rw-r--r-- | include/asm-s390/debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h index 7f1ef99fd1e..c00dd2b3dc5 100644 --- a/include/asm-s390/debug.h +++ b/include/asm-s390/debug.h @@ -10,7 +10,6 @@ #define DEBUG_H #include <linux/fs.h> -#include <linux/string.h> /* Note: * struct __debug_entry must be defined outside of #ifdef __KERNEL__ @@ -35,6 +34,7 @@ struct __debug_entry{ #define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */ #ifdef __KERNEL__ +#include <linux/string.h> #include <linux/spinlock.h> #include <linux/kernel.h> #include <linux/time.h> |