diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-23 22:14:33 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-23 22:14:33 +0900 |
| commit | ab9470e87e54c227e61848db5a615bac4dcef5b1 (patch) | |
| tree | cdfa22df56f8ad6e337efe97c451aff61d81f0a2 | |
| parent | 88b770c544c0b67c5f31f25ebfcaf082fd613408 (diff) | |
| parent | 32e0d718cd463976a780a21749833851b33bcdbb (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/aosp' into linux-linaro-lsk-v3.14-android
| -rw-r--r-- | arch/arm64/include/asm/insn.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index 95da2f2ebc6b..3dfcf1463144 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -120,4 +120,6 @@ u32 aarch32_insn_extract_reg_num(u32 insn, int offset); u32 aarch32_insn_mcr_extract_opc2(u32 insn); u32 aarch32_insn_mcr_extract_crm(u32 insn); +#endif /* __ASSEMBLY__ */ + #endif /* __ASM_INSN_H */ |