summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-01-12 20:45:51 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-01-12 20:45:51 +0000
commit54de29327000f8832c658c479313d2eeda7785cf (patch)
treed33de8fc2a7e1f11e4807788183da5722cb08781 /sys/arch
parent40785a5e24d9c78e87159098b413e8a23b404bb4 (diff)
Enable WSDISPLAY_COMPAT_RAWKBD and wsmux on sparc64; ok matthieu@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/conf/GENERIC9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 123105adf95..ac9682b6ff3 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.229 2009/01/12 20:11:13 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.230 2009/01/12 20:45:50 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -24,6 +24,7 @@ option USBVERBOSE
option WSEMUL_SUN # provide sun terminal emulation; required
option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation
option WSEMUL_DUMB
+option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11
config bsd swap generic
@@ -478,7 +479,7 @@ rfx* at sbus? # RasterFlex framebuffer series
wsdisplay* at rfx?
tvtwo* at sbus? # Parallax XVideo/PowerVideo framebuffer
wsdisplay* at tvtwo?
-vgafb* at pci? # PCI display
+vgafb* at pci? # PCI display (except for Expert3D)
wsdisplay* at vgafb?
vigra* at sbus? # Viagra framebuffer series
wsdisplay* at vigra?
@@ -516,6 +517,4 @@ owsbm* at onewire? # Smart Battery Monitor
owtemp* at onewire? # Temperature
pseudo-device hotplug 1 # devices hot plugging
-
-# mouse & keyboard multiplexor pseudo-devices
-#pseudo-device wsmux 2
+pseudo-device wsmux 2 # mouse & keyboard multiplexor