diff options
| author | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:17:50 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:17:50 +0000 |
| commit | edc341f25c24f553b32736be13a91d350d25b6ea (patch) | |
| tree | a9729d25d19155e7cb890a8730606f4630c4c1f7 /sys/dev | |
| parent | eb1a4be892a8369a6865ff3ca76a20d0a7954019 (diff) | |
| download | FreeBSD-src-edc341f25c24f553b32736be13a91d350d25b6ea.zip FreeBSD-src-edc341f25c24f553b32736be13a91d350d25b6ea.tar.gz | |
Unifdef VM86
Reviewed by: silence on on -current
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/syscons/scvesactl.c | 7 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 6f48630..b71f071 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: $ + * $Id: scvesactl.c,v 1.9 1999/01/11 03:18:26 yokota Exp $ */ #include "sc.h" @@ -31,13 +31,12 @@ #include "opt_syscons.h" #include "opt_vga.h" #include "opt_vesa.h" -#include "opt_vm86.h" #ifdef VGA_NO_MODE_CHANGE #undef VESA #endif -#if (NSC > 0 && NVGA > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE) +#if (NSC > 0 && NVGA > 0 && defined(VESA)) || defined(KLD_MODULE) #include <sys/param.h> #include <sys/systm.h> @@ -140,4 +139,4 @@ vesa_unload_ioctl(void) return 0; } -#endif /* (NSC > 0 && NVGA > 0 && VESA && VM86) || KLD_MODULE */ +#endif /* (NSC > 0 && NVGA > 0 && VESA) || KLD_MODULE */ diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 61b6830..df527fc 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.304 1999/05/30 16:51:42 phk Exp $ + * $Id: syscons.c,v 1.305 1999/05/31 11:25:13 phk Exp $ */ #include "sc.h" @@ -37,7 +37,6 @@ #include "opt_devfs.h" #ifdef __i386__ #include "opt_vesa.h" -#include "opt_vm86.h" #endif #include "opt_syscons.h" @@ -571,7 +570,7 @@ int sc_attach_unit(int unit, int flags) { scr_stat *scp; -#if defined(VESA) && defined(VM86) +#if defined(VESA) video_info_t info; #endif #ifdef DEVFS @@ -596,7 +595,7 @@ sc_attach_unit(int unit, int flags) /* initialize history buffer & pointers */ sc_alloc_history_buffer(scp, sc_history_size, 0, FALSE); -#if defined(VESA) && defined(VM86) +#if defined(VESA) if ((sc_flags & VESA800X600) && ((*vidsw[scp->ad]->get_info)(scp->adp, M_VESA_800x600, &info) == 0)) { #if NSPLASH > 0 @@ -610,7 +609,7 @@ sc_attach_unit(int unit, int flags) splash_init(scp->adp, scsplash_callback); #endif } -#endif /* VESA && VM86 */ +#endif /* VESA */ /* initialize cursor stuff */ if (!ISGRAPHSC(scp)) |
