diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:12:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:12:31 -0700 |
commit | 610f26e75176aeb896618c26b16cbc0601f0e3cf (patch) | |
tree | aa89cee9489c3e3e73cab263700fa08cf9fdb863 | |
parent | e9de427e403f2670a44b5795707d8a240fb018c2 (diff) | |
parent | 27b19565fe4ca5b0e9d2ae98ce4b81ca728bf445 (diff) | |
download | kernel_samsung_aries-610f26e75176aeb896618c26b16cbc0601f0e3cf.zip kernel_samsung_aries-610f26e75176aeb896618c26b16cbc0601f0e3cf.tar.gz kernel_samsung_aries-610f26e75176aeb896618c26b16cbc0601f0e3cf.tar.bz2 |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: warn about lockdep disabling after kernel taint, fix
-rw-r--r-- | include/linux/debug_locks.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h index 493dedb..29b3ce3 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h @@ -3,6 +3,7 @@ #include <linux/kernel.h> #include <asm/atomic.h> +#include <asm/system.h> struct task_struct; |