diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-03-10 20:32:23 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-03-20 16:16:59 +0000 |
| commit | 02f7760e6e5c3d726cd9622749cdae17c571b9a3 (patch) | |
| tree | c32de8d89af2f29b2ef15e6e4d88916d6db93427 /arch/arm64/kernel/cpuinfo.c | |
| parent | 155433cb365ee4666bdf7c3c7bc2978b17be36a4 (diff) | |
| download | lwn-02f7760e6e5c3d726cd9622749cdae17c571b9a3.tar.gz lwn-02f7760e6e5c3d726cd9622749cdae17c571b9a3.zip | |
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>
Diffstat (limited to 'arch/arm64/kernel/cpuinfo.c')
| -rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index efe74ecc9738..260b54f415b8 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <asm/arch_timer.h> -#include <asm/cachetype.h> +#include <asm/cache.h> #include <asm/cpu.h> #include <asm/cputype.h> #include <asm/cpufeature.h> |