aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:28:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:28:53 -0800
commitdd49f96777d5a72d5591ac2112d4ac940391774e (patch)
tree6d9c8bdcd21c600ce1a1c8ea8acb9aec15f6ca4a /include/linux
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff)
parent[MUTEX]: linux/mutex-debug.h needs linux/linkage.h (diff)
downloadlinux-dev-dd49f96777d5a72d5591ac2112d4ac940391774e.tar.xz
linux-dev-dd49f96777d5a72d5591ac2112d4ac940391774e.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mutex-debug.h2
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 @@
#ifndef __LINUX_MUTEX_DEBUG_H
#define __LINUX_MUTEX_DEBUG_H
+#include <linux/linkage.h>
+
/*
* Mutexes - debugging helpers:
*/