diff options
Diffstat (limited to 'sys/arch/i386/stand')
-rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.c | 7 | ||||
-rw-r--r-- | sys/arch/i386/stand/libsa/dev_i386.c | 11 | ||||
-rw-r--r-- | sys/arch/i386/stand/libsa/diskprobe.c | 9 | ||||
-rw-r--r-- | sys/arch/i386/stand/libsa/exec_i386.c | 7 |
4 files changed, 29 insertions, 5 deletions
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c index 73d4e78e8af..3d1e1aba85f 100644 --- a/sys/arch/i386/stand/libsa/biosdev.c +++ b/sys/arch/i386/stand/libsa/biosdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.c,v 1.85 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: biosdev.c,v 1.86 2012/11/01 00:55:38 jsing Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -41,6 +41,11 @@ #include "disk.h" #include "libsa.h" +#ifdef SOFTRAID +#include <dev/softraidvar.h> +#include "softraid.h" +#endif + static const char *biosdisk_err(u_int); static int biosdisk_errno(u_int); diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c index 06d1e55a9b6..7f8b81971a4 100644 --- a/sys/arch/i386/stand/libsa/dev_i386.c +++ b/sys/arch/i386/stand/libsa/dev_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_i386.c,v 1.37 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: dev_i386.c,v 1.38 2012/11/01 00:55:38 jsing Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -27,10 +27,19 @@ */ #include <sys/param.h> +#include <sys/queue.h> +#include <sys/disklabel.h> #include <dev/cons.h> #include "libsa.h" #include "biosdev.h" +#include "disk.h" + +#ifdef SOFTRAID +#include <dev/biovar.h> +#include <dev/softraidvar.h> +#include "softraid.h" +#endif extern int debug; diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c index 16292b1f8bc..1d466e7cc45 100644 --- a/sys/arch/i386/stand/libsa/diskprobe.c +++ b/sys/arch/i386/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.33 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.34 2012/11/01 00:55:38 jsing Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -34,14 +34,19 @@ #include <sys/queue.h> #include <sys/reboot.h> #include <sys/disklabel.h> + #include <lib/libz/zlib.h> #include <machine/biosvar.h> #include <stand/boot/bootarg.h> -#include "biosdev.h" #include "disk.h" +#include "biosdev.h" #include "libsa.h" +#ifdef SOFTRAID +#include "softraid.h" +#endif + #define MAX_CKSUMLEN MAXBSIZE / DEV_BSIZE /* Max # of blks to cksum */ /* Local Prototypes */ diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c index 49e644b562c..5f022a5cbc4 100644 --- a/sys/arch/i386/stand/libsa/exec_i386.c +++ b/sys/arch/i386/stand/libsa/exec_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_i386.c,v 1.38 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.39 2012/11/01 00:55:38 jsing Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -38,6 +38,11 @@ #include "disk.h" #include "libsa.h" +#ifdef SOFTRAID +#include <dev/softraidvar.h> +#include "softraid.h" +#endif + typedef void (*startfuncp)(int, int, int, int, int, int, int, int) __attribute__ ((noreturn)); |