commit 02f7760e6e5c3d726cd9622749cdae17c571b9a3
author Will Deacon <will.deacon@arm.com> Fri Mar 10 20:32:23 2017 +0000
committer Catalin Marinas <catalin.marinas@arm.com> Mon Mar 20 16:16:59 2017 +0000
tree c32de8d89af2f29b2ef15e6e4d88916d6db93427
parent 155433cb365ee4666bdf7c3c7bc2978b17be36a4

arm64: cache: Merge cachetype.h into cache.h

cachetype.h and cache.h are small and both obviously related to caches.
Merge them together to reduce clutter.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

arch/arm64/mm/flush.c

diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
index 1e96822..21a8d82 100644
--- a/arch/arm64/mm/flush.c
+++ b/arch/arm64/mm/flush.c
@@ -22,7 +22,7 @@
 #include <linux/pagemap.h>
 
 #include <asm/cacheflush.h>
-#include <asm/cachetype.h>
+#include <asm/cache.h>
 #include <asm/tlbflush.h>
 
 void sync_icache_aliases(void *kaddr, unsigned long len)