diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-11-01 00:55:39 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-11-01 00:55:39 +0000 |
| commit | 165274bd8629379daeeb5e8a736cda26c030ecc3 (patch) | |
| tree | a9b323d30404c0ccc71e46162247b344df30fd10 /sys/arch/i386/stand/libsa/exec_i386.c | |
| parent | 3c26768939b5f74c798b31cc64da564ae903ba77 (diff) | |
Fix merge errors.
Found the hard way by deraadt@
Diffstat (limited to 'sys/arch/i386/stand/libsa/exec_i386.c')
| -rw-r--r-- | sys/arch/i386/stand/libsa/exec_i386.c | 7 |
1 files changed, 6 insertions, 1 deletions
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)); |