diff options
| author | phk <phk@FreeBSD.org> | 2003-04-04 16:35:16 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-04-04 16:35:16 +0000 |
| commit | 84d6b36e309c74d75565793688f01807fb1340f6 (patch) | |
| tree | a6b84bed6839656a8003f724b1f2eec04ec03e0f /sys/boot/pc98 | |
| parent | 4ea6a23f8df49350892e9ec146853181cbce31bb (diff) | |
| download | FreeBSD-src-84d6b36e309c74d75565793688f01807fb1340f6.zip FreeBSD-src-84d6b36e309c74d75565793688f01807fb1340f6.tar.gz | |
Libdisk does not need to include <sys/diskslice.h> any more.
Move the remaining bits of <sys/diskslice.h> to <i386/include/bootinfo.h>
Move i386/pc98 specific bits from <sys/reboot.h> to
<i386/include/bootinfo.h> as well.
Adjust includes in sys/boot accordingly.
Diffstat (limited to 'sys/boot/pc98')
| -rw-r--r-- | sys/boot/pc98/boot2/disk.c | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/boot2/sys.c | 1 | ||||
| -rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c index f0eaf67..f8636eb 100644 --- a/sys/boot/pc98/boot2/disk.c +++ b/sys/boot/pc98/boot2/disk.c @@ -43,8 +43,8 @@ #include "boot.h" #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> +#include <machine/bootinfo.h> #define BIOS_DEV_FLOPPY 0x0 #define BIOS_DEV_WIN 0x80 diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c index eb65d33..9963ae5 100644 --- a/sys/boot/pc98/boot2/sys.c +++ b/sys/boot/pc98/boot2/sys.c @@ -33,7 +33,6 @@ #include "boot.h" #include <sys/dirent.h> -#include <sys/reboot.h> #if 0 /* #define BUFSIZE 4096 */ diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c index d1427f9..dd251a7 100644 --- a/sys/boot/pc98/libpc98/biosdisk.c +++ b/sys/boot/pc98/libpc98/biosdisk.c @@ -39,9 +39,8 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <stdarg.h> |
