diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
commit | 169c29d1b708c51bbae3f546e0adfe0d433b5b7b (patch) | |
tree | 15b32c155eb85259ca3be610962de5f8aa24b91c /sys/arch/i386/include/pccons.h | |
parent | 7aa5f12551d2fef2475152a3a5c9b9961e14b83a (diff) |
Merging w/ NetBSD 021796.
speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).
Diffstat (limited to 'sys/arch/i386/include/pccons.h')
-rw-r--r-- | sys/arch/i386/include/pccons.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/arch/i386/include/pccons.h b/sys/arch/i386/include/pccons.h index 9ea704e6a4d..f1eb362d867 100644 --- a/sys/arch/i386/include/pccons.h +++ b/sys/arch/i386/include/pccons.h @@ -1,4 +1,4 @@ -/* $NetBSD: pccons.h,v 1.3 1995/03/28 18:17:02 jtc Exp $ */ +/* $NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp $ */ /* * pccons.h -- pccons ioctl definitions @@ -7,11 +7,7 @@ #ifndef _PCCONS_H_ #define _PCCONS_H_ -#ifndef _KERNEL #include <sys/ioctl.h> -#else -#include "ioctl.h" -#endif #define CONSOLE_X_MODE_ON _IO('t',121) #define CONSOLE_X_MODE_OFF _IO('t',122) |