summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/conf/GENERIC')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 46751755757..e2dfb7caae3 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.303 2010/09/23 16:21:46 yuo Exp $
+# $OpenBSD: GENERIC,v 1.304 2010/09/26 20:39:08 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -279,14 +279,12 @@ 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?
wsdisplay* at vga?
wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0
-wsmouse* at pmsi? mux 0
intagp* at vga? # intel integrated graphics
agp* at intagp?