diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2013-01-17 12:07:20 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2013-01-17 12:07:20 +0000 |
commit | 30179cf655de82f7ba463b6515ef59f92690d21a (patch) | |
tree | 6bf904301becf9d6e8bfbf8ece2b4ca4f5226444 /sys/arch | |
parent | b0d50948a761031a745cae9755ea55f9a7fa93c5 (diff) |
Clean includes.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/amd64/stand/cdbr/cdbr.S | 5 | ||||
-rw-r--r-- | sys/arch/amd64/stand/libsa/bioscons.c | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/cdbr/cdbr.S b/sys/arch/amd64/stand/cdbr/cdbr.S index 97b9703482d..94663cdc003 100644 --- a/sys/arch/amd64/stand/cdbr/cdbr.S +++ b/sys/arch/amd64/stand/cdbr/cdbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cdbr.S,v 1.4 2012/10/28 15:45:58 jsing Exp $ */ +/* $OpenBSD: cdbr.S,v 1.5 2013/01/17 12:07:19 jsing Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove <tom.cosgrove@arches-consulting.com> @@ -32,9 +32,6 @@ .file "cdbr.S" -/* #include <machine/asm.h> */ -/* #include <assym.h> */ - /* * This program is a CD boot sector, similar to the partition boot record * (pbr, also called biosboot) used by hard disks. It is implemented as a diff --git a/sys/arch/amd64/stand/libsa/bioscons.c b/sys/arch/amd64/stand/libsa/bioscons.c index a3e1425b894..2e2bbb4ed16 100644 --- a/sys/arch/amd64/stand/libsa/bioscons.c +++ b/sys/arch/amd64/stand/libsa/bioscons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bioscons.c,v 1.8 2012/10/30 14:06:29 jsing Exp $ */ +/* $OpenBSD: bioscons.c,v 1.9 2013/01/17 12:07:19 jsing Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -27,15 +27,18 @@ */ #include <sys/types.h> + #include <machine/biosvar.h> #include <machine/pio.h> -#include <dev/isa/isareg.h> + +#include <dev/cons.h> #include <dev/ic/mc146818reg.h> #include <dev/ic/comreg.h> #include <dev/ic/ns16450reg.h> -/* #include <i386/isa/nvram.h> */ -#include <dev/cons.h> +#include <dev/isa/isareg.h> + #include <lib/libsa/stand.h> + #include "biosdev.h" /* XXX cannot trust NVRAM on this. Maybe later we make a real probe. */ |