summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/system.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 14:05:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 14:05:57 -0700
commitf560902c2d39c255bd67c0211f5dd80edb97a712 (patch)
treec45601159db0808e76c78212c74885cd219b2866 /arch/microblaze/include/asm/system.h
parent9861df15f44d98eb6fa9a839b558633ecee87194 (diff)
parentdb6e3f91efd2cf61b9965f722902199cf54adc4f (diff)
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix cast warning for init.c microblaze: Wire up new syscalls microblaze: use generic syscalls.h microblaze: clean up signal handling microblaze: convert all simple headers to use asm-generic microblaze: use the generic lib/checksum.c microblaze: fall back on generic header files for the ABI
Diffstat (limited to 'arch/microblaze/include/asm/system.h')
-rw-r--r--arch/microblaze/include/asm/system.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
index c4e308850b5d..b1ed61590660 100644
--- a/arch/microblaze/include/asm/system.h
+++ b/arch/microblaze/include/asm/system.h
@@ -13,6 +13,9 @@
#include <asm/setup.h>
#include <asm/irqflags.h>
+#include <asm-generic/cmpxchg.h>
+#include <asm-generic/cmpxchg-local.h>
+
struct task_struct;
struct thread_info;