diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 02:47:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 02:50:06 -0400 |
commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /lib/spinlock_debug.c | |
parent | 99dd5497e5be4fe4194cad181d45fd6569a930db (diff) | |
parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/spinlock_debug.c')
-rw-r--r-- | lib/spinlock_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index 5f3eacdd6178..525d160d44f0 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
12 | #include <linux/debug_locks.h> | 12 | #include <linux/debug_locks.h> |
13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
14 | #include <linux/module.h> | 14 | #include <linux/export.h> |
15 | 15 | ||
16 | void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, | 16 | void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, |
17 | struct lock_class_key *key) | 17 | struct lock_class_key *key) |