summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-19 15:49:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-19 15:49:31 -0800
commite87e7be92979480ee5a2d4a746dc88f2eeca79ca (patch)
treee30366e742d61bdeb2ad5ba13859b14480213224
parentdec8e46178bad9f1717a948572d76e0f804be801 (diff)
parent24b9fdc59ac365e7e313e5af44c7bfe31c15c774 (diff)
downloadlinux-e87e7be92979480ee5a2d4a746dc88f2eeca79ca.tar.bz2
Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fix from Tony Luck: "Unbreak ia64 build by avoiding circular dependency" * tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: kernel/bounds: avoid circular dependencies in generated headers
-rw-r--r--kernel/bounds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bounds.c b/kernel/bounds.c
index 578782ef6ae1..5253204afdca 100644
--- a/kernel/bounds.c
+++ b/kernel/bounds.c
@@ -11,7 +11,7 @@
#include <linux/kbuild.h>
#include <linux/page_cgroup.h>
#include <linux/log2.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
void foo(void)
{