diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2009-09-23 20:49:14 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2009-09-23 20:49:14 +0000 |
| commit | 19de5df5e5ddb928640951dcb5cbac3b3bb6c62e (patch) | |
| tree | 0a913ff27a7b4b7b8968466002423bf0d5e59bc0 | |
| parent | 9747418cc409f936fde0ee1a74497c28ee710e3b (diff) | |
Notes
| -rw-r--r-- | sys/compat/x86bios/x86bios.c (renamed from sys/dev/x86bios/x86bios.c) | 2 | ||||
| -rw-r--r-- | sys/compat/x86bios/x86bios.h (renamed from sys/dev/x86bios/x86bios.h) | 0 | ||||
| -rw-r--r-- | sys/compat/x86bios/x86bios_alloc.c (renamed from sys/dev/x86bios/x86bios_alloc.c) | 2 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 5 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbd.c | 2 | ||||
| -rw-r--r-- | sys/dev/dpms/dpms.c | 2 | ||||
| -rw-r--r-- | sys/dev/fb/vesa.c | 2 | ||||
| -rw-r--r-- | sys/modules/x86bios/Makefile | 2 |
9 files changed, 10 insertions, 11 deletions
diff --git a/sys/dev/x86bios/x86bios.c b/sys/compat/x86bios/x86bios.c index 1bb86e36b93c..5cb6bdf6f557 100644 --- a/sys/dev/x86bios/x86bios.c +++ b/sys/compat/x86bios/x86bios.c @@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$"); #include <contrib/x86emu/x86emu.h> #include <contrib/x86emu/x86emu_regs.h> -#include <dev/x86bios/x86bios.h> +#include <compat/x86bios/x86bios.h> u_char *pbiosMem = NULL; static u_char *pbiosStack = NULL; diff --git a/sys/dev/x86bios/x86bios.h b/sys/compat/x86bios/x86bios.h index 3785f3cb3b05..3785f3cb3b05 100644 --- a/sys/dev/x86bios/x86bios.h +++ b/sys/compat/x86bios/x86bios.h diff --git a/sys/dev/x86bios/x86bios_alloc.c b/sys/compat/x86bios/x86bios_alloc.c index 38bb472d1c13..624a75ce0088 100644 --- a/sys/dev/x86bios/x86bios_alloc.c +++ b/sys/compat/x86bios/x86bios_alloc.c @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <dev/x86bios/x86bios.h> +#include <compat/x86bios/x86bios.h> extern u_char *pbiosMem; extern int busySegMap[5]; diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 244a9b784c7f..3231bb557bbf 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -297,8 +297,7 @@ libkern/memset.c standard # # x86 real mode BIOS emulator, required by atkbdc/dpms/vesa # -dev/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa -dev/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa contrib/x86emu/x86emu_util.c optional x86bios | atkbd | dpms | vesa - +compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa +compat/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index b332f31ec0d2..3728fad1e67e 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -381,7 +381,7 @@ i386/xbox/pic16l.s optional xbox # # x86 real mode BIOS emulator, required by atkbdc/dpms/vesa # -dev/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa -dev/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa contrib/x86emu/x86emu_util.c optional x86bios | atkbd | dpms | vesa +compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa +compat/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index bb6aed6e2899..54ea15632033 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #if 0 #include <machine/md_var.h> #include <machine/psl.h> -#include <dev/x86bios/x86bios.h> +#include <compat/x86bios/x86bios.h> #include <machine/pc/bios.h> #include <vm/vm.h> diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c index d21839b74f94..17f68daa1d4b 100644 --- a/sys/dev/dpms/dpms.c +++ b/sys/dev/dpms/dpms.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include <sys/libkern.h> #include <sys/module.h> -#include <dev/x86bios/x86bios.h> +#include <compat/x86bios/x86bios.h> /* * VESA DPMS States diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index a91d1f011b02..f6c6d6a5c8b5 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <isa/isareg.h> -#include <dev/x86bios/x86bios.h> +#include <compat/x86bios/x86bios.h> #define VESA_VIA_CLE266 "VIA CLE266\r\n" diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile index 5dc381187309..8b5fa302a78f 100644 --- a/sys/modules/x86bios/Makefile +++ b/sys/modules/x86bios/Makefile @@ -4,7 +4,7 @@ KMOD= x86bios SRCS= opt_x86bios.h .PATH: ${.CURDIR}/../../contrib/x86emu -.PATH: ${.CURDIR}/../../dev/x86bios +.PATH: ${.CURDIR}/../../compat/x86bios SRCS+= x86bios.c x86bios_alloc.c x86emu.c x86emu_util.c .include <bsd.kmod.mk> |