9os

commit 93d37ba0cc4b80ffab7c4f167c5b1c0dcdd2a7c1
parent 389fb9a6a43df0f9b1941333938565d20328762b
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Fri, 12 Oct 2018 12:57:35 +0100

Merge "Move machine.h to the default include directory"
Diffstat:
M
arch/arm64/panic.c
 | 
2
+-
M
arch/arm64/rom.c
 | 
2
+-
R
include/bits/arm64/arch/machine.h -> include/machine.h
 | 
0

3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/panic.c b/arch/arm64/panic.c
@@ -1,5 +1,5 @@
 #include <rcode.h>
-#include <arch/machine.h>
+#include <machine.h>
 
 void
 cpanic(const char *msg, struct trapframe *fp)
diff --git a/arch/arm64/rom.c b/arch/arm64/rom.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <arch/machine.h>
+#include <machine.h>
 #include <rcode.h>
 
 void
diff --git a/include/bits/arm64/arch/machine.h b/include/machine.h