diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-26 20:39:09 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-26 20:39:09 +0000 |
| commit | 7fde2299b4752614becf369bf6cf0e69fcc858be (patch) | |
| tree | f6e6539d443aa4fa956790391a3dbe63b2c799ef /sys/arch/i386/conf | |
| parent | a0bbe5baf821963522edd04f536509b4351ca7ab (diff) | |
Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 0d3bdfdfd59..ebf348f944b 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.697 2010/09/23 16:21:46 yuo Exp $ +# $OpenBSD: GENERIC,v 1.698 2010/09/26 20:39:08 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -342,7 +342,6 @@ option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11 pckbc0 at isa? flags 0x00 # PC keyboard controller pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse -pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? option X86EMU # to POST video cards vga* at pci? @@ -351,7 +350,6 @@ wsdisplay* at vga? wsdisplay* at pcdisplay? wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 -wsmouse* at pmsi? mux 0 intagp* at vga? # intel integrated graphics agp aliagp* at pchb? |