diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-06-06 00:49:08 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-06-06 00:49:08 +0000 |
| commit | 4b01352887d82b76d10003690678df8130f99696 (patch) | |
| tree | 06051cbc5ebd09d613a531d18da975b0ed5b43ed | |
| parent | Handle our new ELF core dumps. (diff) | |
| download | wireguard-openbsd-4b01352887d82b76d10003690678df8130f99696.tar.xz wireguard-openbsd-4b01352887d82b76d10003690678df8130f99696.zip | |
fix include paths
| -rw-r--r-- | sys/arch/amd64/pci/vga_post.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/pci/vga_post.c | 6 | ||||
| -rw-r--r-- | sys/conf/files | 9 | ||||
| -rw-r--r-- | sys/dev/x86emu/x86emu.c | 4 | ||||
| -rw-r--r-- | sys/dev/x86emu/x86emu_util.c | 4 |
5 files changed, 15 insertions, 14 deletions
diff --git a/sys/arch/amd64/pci/vga_post.c b/sys/arch/amd64/pci/vga_post.c index 35f6840acf1..1cf51cf541b 100644 --- a/sys/arch/amd64/pci/vga_post.c +++ b/sys/arch/amd64/pci/vga_post.c @@ -1,5 +1,5 @@ /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */ -/* $OpenBSD: vga_post.c,v 1.1 2009/06/06 00:35:00 pirofti Exp $ */ +/* $OpenBSD: vga_post.c,v 1.2 2009/06/06 00:49:08 deraadt Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -42,8 +42,8 @@ #include <machine/vga_post.h> -#include <lib/libkern/x86emu.h> -#include <lib/libkern/x86emu_regs.h> +#include <dev/x86emu/x86emu.h> +#include <dev/x86emu/x86emu_regs.h> #define BASE_MEMORY 65536 /* How much memory to allocate in Real Mode */ diff --git a/sys/arch/i386/pci/vga_post.c b/sys/arch/i386/pci/vga_post.c index 43f0a86cf47..a5304b4b4f1 100644 --- a/sys/arch/i386/pci/vga_post.c +++ b/sys/arch/i386/pci/vga_post.c @@ -1,5 +1,5 @@ /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */ -/* $OpenBSD: vga_post.c,v 1.1 2009/06/06 00:35:00 pirofti Exp $ */ +/* $OpenBSD: vga_post.c,v 1.2 2009/06/06 00:49:08 deraadt Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -42,8 +42,8 @@ #include <machine/vga_post.h> -#include <lib/libkern/x86emu.h> -#include <lib/libkern/x86emu_regs.h> +#include <dev/x86emu/x86emu.h> +#include <dev/x86emu/x86emu_regs.h> #define BASE_MEMORY 65536 /* How much memory to allocate in Real Mode */ diff --git a/sys/conf/files b/sys/conf/files index 3578de71592..a844bfaa387 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.460 2009/06/06 00:35:00 pirofti Exp $ +# $OpenBSD: files,v 1.461 2009/06/06 00:49:08 deraadt Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -1042,6 +1042,10 @@ file compat/common/uipc_syscalls_43.c !small_kernel file compat/common/vfs_syscalls_43.c !small_kernel file compat/common/vm_43.c !small_kernel +# libx86emu +file dev/x86emu/x86emu.c vga_post +file dev/x86emu/x86emu_util.c vga_post + # libkern MI components file lib/libkern/mcount.c gprof file lib/libkern/getsn.c @@ -1078,6 +1082,3 @@ file lib/libkern/arch/${MACHINE_ARCH}/skpc.S | lib/libkern/skpc.c file lib/libkern/arch/${MACHINE_ARCH}/htonl.S | lib/libkern/htonl.c file lib/libkern/arch/${MACHINE_ARCH}/htons.S | lib/libkern/htons.c file lib/libkern/arch/${MACHINE_ARCH}/strncasecmp.S | lib/libkern/strncasecmp.c -# libx86emu -file lib/libkern/x86emu.c !small_kernel -file lib/libkern/x86emu_util.c !small_kernel diff --git a/sys/dev/x86emu/x86emu.c b/sys/dev/x86emu/x86emu.c index 4fd0438bec4..7722356755a 100644 --- a/sys/dev/x86emu/x86emu.c +++ b/sys/dev/x86emu/x86emu.c @@ -32,8 +32,8 @@ * ****************************************************************************/ -#include <lib/libkern/x86emu.h> -#include <lib/libkern/x86emu_regs.h> +#include <dev/x86emu/x86emu.h> +#include <dev/x86emu/x86emu_regs.h> static void x86emu_intr_raise (struct X86EMU *, uint8_t type); diff --git a/sys/dev/x86emu/x86emu_util.c b/sys/dev/x86emu/x86emu_util.c index f9d5761a46f..74b7e5ae610 100644 --- a/sys/dev/x86emu/x86emu_util.c +++ b/sys/dev/x86emu/x86emu_util.c @@ -35,8 +35,8 @@ #include <sys/param.h> #include <sys/endian.h> -#include <lib/libkern/x86emu.h> -#include <lib/libkern/x86emu_regs.h> +#include <dev/x86emu/x86emu.h> +#include <dev/x86emu/x86emu_regs.h> /**************************************************************************** |