diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:53 -0500 |
commit | dd49f96777d5a72d5591ac2112d4ac940391774e (patch) | |
tree | 6d9c8bdcd21c600ce1a1c8ea8acb9aec15f6ca4a /include | |
parent | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (diff) | |
parent | 8b4ad5e3ff94409973e824716c65568f0d97364c (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mutex-debug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h index 0ccd8f983b50..8138d9eb58ec 100644 --- a/include/linux/mutex-debug.h +++ b/include/linux/mutex-debug.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef __LINUX_MUTEX_DEBUG_H | 1 | #ifndef __LINUX_MUTEX_DEBUG_H |
2 | #define __LINUX_MUTEX_DEBUG_H | 2 | #define __LINUX_MUTEX_DEBUG_H |
3 | 3 | ||
4 | #include <linux/linkage.h> | ||
5 | |||
4 | /* | 6 | /* |
5 | * Mutexes - debugging helpers: | 7 | * Mutexes - debugging helpers: |
6 | */ | 8 | */ |