diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:29:16 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:29:16 +0000 |
| commit | 0d0ffa94e0ea0aab3dcb75366806d064f05fdc45 (patch) | |
| tree | 43e74553fa29f2c303c3ba03395060aece1785d1 /arch/arm/include/asm/opcodes.h | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
| parent | 2bdd424f26be1c98b6e3d9acfffb5559c131c888 (diff) | |
Merge branch 'for-rmk/virt/psci' into for-arm-soc/virt/mach
Diffstat (limited to 'arch/arm/include/asm/opcodes.h')
| -rw-r--r-- | arch/arm/include/asm/opcodes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h index 74e211a6fb2..e796c598513 100644 --- a/arch/arm/include/asm/opcodes.h +++ b/arch/arm/include/asm/opcodes.h @@ -10,6 +10,7 @@ #define __ASM_ARM_OPCODES_H #ifndef __ASSEMBLY__ +#include <linux/linkage.h> extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr); #endif |