diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:19:12 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:19:12 -0800 |
| commit | c579c69130742ae8cd6a41cd6c04462dd70c27e1 (patch) | |
| tree | 4d3f6607e3e82f7a851f0fd8f8409da9474db4a4 /arch/arm64/mm/cache.S | |
| parent | c44a8c420f3fc9b03eb1e05b39701ca5cfba101d (diff) | |
| parent | 9f41e6b222c4a04c7b46068df82842a6188b4a57 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android
Diffstat (limited to 'arch/arm64/mm/cache.S')
| -rw-r--r-- | arch/arm64/mm/cache.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 2560e1e1562e..70a79cb6d504 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -22,7 +22,7 @@ #include <linux/init.h> #include <asm/assembler.h> #include <asm/cpufeature.h> -#include <asm/alternative-asm.h> +#include <asm/alternative.h> #include "proc-macros.S" |