[src/sommerfeld_i386mp_1]: src/sys/arch/i386/conf Merge up

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75e0e0026ecf
branches:  sommerfeld_i386mp_1
changeset: 482530:75e0e0026ecf
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sat May 18 16:20:08 2002 +0000

description:
Merge up

diffstat:

 sys/arch/i386/conf/HYDRA |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r e853db36aa6f -r 75e0e0026ecf sys/arch/i386/conf/HYDRA
--- a/sys/arch/i386/conf/HYDRA  Wed May 15 19:23:55 2002 +0000
+++ b/sys/arch/i386/conf/HYDRA  Sat May 18 16:20:08 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: HYDRA,v 1.1.2.8 2002/05/03 19:12:55 sommerfeld Exp $
+#      $NetBSD: HYDRA,v 1.1.2.9 2002/05/18 16:20:08 sommerfeld Exp $
 #
 #      HYDRA -- ABIT BP6-based system used for MP development.
 #
 
 include "arch/i386/conf/std.i386"
 
+options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
+
 maxusers       32              # estimated number of users
 
 # CPU support.  At least one is REQUIRED.
@@ -250,7 +252,7 @@
 pckbd*         at pckbc?               # PC keyboard
 # "opms" should not be enabled together with "pms" or "pmsi"
 pms*           at pckbc?               # PS/2 mouse for wsmouse
-pmsi*          at pckbc?               # PS/2 "Intelli"mouse for wsmouse
+#pmsi*         at pckbc?               # PS/2 "Intelli"mouse for wsmouse
 #opms*         at pckbc?               # backwards compatible PS/2 mouse
 vga0           at isa?
 vga*           at pci?
@@ -259,7 +261,7 @@
 wsdisplay*     at pcdisplay? console ?
 wskbd*                 at pckbd? console ?
 wsmouse*       at pms? mux 0
-wsmouse*       at pmsi? mux 0
+#wsmouse*      at pmsi? mux 0
 
 pcppi0 at isa?
 sysbeep0       at pcppi?