summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-06 00:19:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-06 00:19:06 +0100
commitb4874a3d298606c20118d1ead73235439bbc2823 (patch)
tree0b6122df3a52650c7861c8e505c01fc381bc43e8 /arch/arm
parentceaa1a13c0e53242555fa45887d82339a3f93c78 (diff)
parent8ef102c6b4bc996ff96ca52b34775fe931ec90c9 (diff)
downloadblackbird-op-linux-b4874a3d298606c20118d1ead73235439bbc2823.tar.gz
blackbird-op-linux-b4874a3d298606c20118d1ead73235439bbc2823.zip
Merge branch 'fixes' into for-linus
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/syscall.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
index 47486a41c56e..9fdded6b1089 100644
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -8,6 +8,7 @@
#define _ASM_ARM_SYSCALL_H
#include <linux/err.h>
+#include <linux/sched.h>
#include <asm/unistd.h>
OpenPOWER on IntegriCloud