diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
| commit | dc767302872a55c9849aade1719134a2ba7528b0 (patch) | |
| tree | b55bfce70e8a825e9a041b3a96fdf6485589bed1 /arch/arm/common/mcpm_head.S | |
| parent | 696e897344f58397b3d463fbb9f9a2f317d720c0 (diff) | |
| parent | 483a53b310dfefdd8c010ba0cc5b2addfaef123f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/hardware/coresight.h
Diffstat (limited to 'arch/arm/common/mcpm_head.S')
| -rw-r--r-- | arch/arm/common/mcpm_head.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/common/mcpm_head.S b/arch/arm/common/mcpm_head.S index 057e9c5a9e1f..0decb3c07165 100644 --- a/arch/arm/common/mcpm_head.S +++ b/arch/arm/common/mcpm_head.S @@ -15,6 +15,7 @@ #include <linux/linkage.h> #include <asm/mcpm.h> +#include <asm/assembler.h> #include "vlock.h" @@ -47,6 +48,7 @@ ENTRY(mcpm_entry_point) + ARM_BE8(setend be) THUMB( adr r12, BSYM(1f) ) THUMB( bx r12 ) THUMB( .thumb ) |