diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2007-11-13 12:01:46 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2007-11-13 12:01:46 +0000 |
| commit | 2af35b0ab57b9e434976760efc393d691283bf9a (patch) | |
| tree | e53f9e2cd1d787552b9ebc9c02513ba96f5d966b /sys/arch/sgi | |
| parent | 30da82e4b05ad7a6ec21d199bd63955f7db3dc95 (diff) | |
Give wscons_machdep.c half a spanking. This allows wsdisplay to compile on
OpenBSD/sgi and prevents it from stealing the console.
ok miod@
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/dev/wscons_machdep.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/arch/sgi/dev/wscons_machdep.c b/sys/arch/sgi/dev/wscons_machdep.c index e33b75bdcd4..e51ccdcd8b1 100644 --- a/sys/arch/sgi/dev/wscons_machdep.c +++ b/sys/arch/sgi/dev/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.4 2006/06/11 21:00:48 matthieu Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.5 2007/11/13 12:01:45 jsing Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -37,10 +37,6 @@ #include <machine/bus.h> #include <dev/cons.h> -#include <dev/ic/mc6845reg.h> -#include <dev/ic/pcdisplayvar.h> -#include <dev/ic/vgareg.h> -#include <dev/ic/vgavar.h> #include "wsdisplay.h" #if NWSDISPLAY > 0 @@ -70,7 +66,6 @@ wscnprobe(struct consdev *cp) cp->cn_dev = makedev(maj, 0); cp->cn_pri = CN_INTERNAL; - cp->cn_pri = CN_REMOTE; } void @@ -83,10 +78,10 @@ static int initted; initted = 1; - if (!vga_cnattach(&sys_config.pci_io[0], &sys_config.pci_mem[0], - WSDISPLAY_TYPE_PCIVGA, 1)) { - ukbd_cnattach(); - } +#if notyet + ukbd_cnattach(); +#endif + return; } |