diff options
author | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
commit | 2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc (patch) | |
tree | 189387b82cfd998170d39dfc998de0fc86602544 /kernel/uart.c | |
parent | 75b0c6fc91c1264aaa5d080d9faeb87c90d02ad3 (diff) | |
parent | 60ed537427c31d320ca4c8778d21d13304285b00 (diff) | |
download | xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.gz xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.bz2 xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.zip |
Merge branch 'riscv-proc' into riscv
Diffstat (limited to 'kernel/uart.c')
-rw-r--r-- | kernel/uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/uart.c b/kernel/uart.c index 35fac1b..b8dd664 100644 --- a/kernel/uart.c +++ b/kernel/uart.c @@ -2,8 +2,8 @@ #include "param.h" #include "memlayout.h" #include "riscv.h" -#include "proc.h" #include "spinlock.h" +#include "proc.h" #include "defs.h" // |