From 4739dc10110863af3ccbe7e923b061c04ca5069a Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Mon, 1 Jun 2015 10:47:41 +0100 Subject: arm64: alternative: Merge alternative-asm.h into alternative.h commit 8d883b23aed73cad844ba48051c7e96eddf0f51c upstream. asm/alternative-asm.h and asm/alternative.h are extremely similar, and really deserve to live in the same file (as this makes further modufications a bit easier). Fold the content of alternative-asm.h into alternative.h, and update the few users. Acked-by: Will Deacon Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas Signed-off-by: David Brown --- arch/arm64/mm/cache.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/mm/cache.S') 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 #include #include -#include +#include #include "proc-macros.S" -- cgit v1.2.3