Acked-by: Marc Zyngier <maz@xxxxxxxxxx>
Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
---
Makefile | 1 -
arm/{aarch64 => }/include/asm/image.h | 0
arm/{aarch64 => }/include/asm/kernel.h | 0
arm/{aarch64 => }/include/asm/kvm.h | 0
arm/{aarch64 => }/include/asm/pmu.h | 0
arm/{aarch64 => }/include/asm/sve_context.h | 0
6 files changed, 1 deletion(-)
rename arm/{aarch64 => }/include/asm/image.h (100%)
rename arm/{aarch64 => }/include/asm/kernel.h (100%)
rename arm/{aarch64 => }/include/asm/kvm.h (100%)
rename arm/{aarch64 => }/include/asm/pmu.h (100%)
rename arm/{aarch64 => }/include/asm/sve_context.h (100%)
diff --git a/Makefile b/Makefile
index 25ee9b0..3085609 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,6 @@ ifeq ($(ARCH), arm64)
OBJS += arm/pvtime.o
OBJS += arm/pmu.o
ARCH_INCLUDE := arm/include
- ARCH_INCLUDE += -Iarm/aarch64/include
ARCH_WANT_LIBFDT := y
ARCH_HAS_FLASH_MEM := y
diff --git a/arm/aarch64/include/asm/image.h b/arm/include/asm/image.h
similarity index 100%
rename from arm/aarch64/include/asm/image.h
rename to arm/include/asm/image.h
diff --git a/arm/aarch64/include/asm/kernel.h b/arm/include/asm/kernel.h
similarity index 100%
rename from arm/aarch64/include/asm/kernel.h
rename to arm/include/asm/kernel.h
diff --git a/arm/aarch64/include/asm/kvm.h b/arm/include/asm/kvm.h
similarity index 100%
rename from arm/aarch64/include/asm/kvm.h
rename to arm/include/asm/kvm.h
diff --git a/arm/aarch64/include/asm/pmu.h b/arm/include/asm/pmu.h
similarity index 100%
rename from arm/aarch64/include/asm/pmu.h
rename to arm/include/asm/pmu.h
diff --git a/arm/aarch64/include/asm/sve_context.h b/arm/include/asm/sve_context.h
similarity index 100%
rename from arm/aarch64/include/asm/sve_context.h
rename to arm/include/asm/sve_context.h
--
2.39.5
