@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97.2.1 2012/07/25 21:30:34 martin Exp $
+# $NetBSD: GENERIC,v 1.97.2.2 2014/01/12 12:08:36 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.97.2.1 $"
+#ident 		"GENERIC-$Revision: 1.97.2.2 $"
 
 maxusers	8
 
@@ -79,7 +79,7 @@
 #file-system	LFS		# log-structured file system
 file-system 	NFS		# nfs client support
 file-system	MFS
-#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
+file-system 	CD9660		# ISO 9660 + Rock Ridge file system
 #file-system	MSDOSFS		# MS-DOS FAT file system
 file-system 	KERNFS		# /kern
 file-system 	PROCFS		# /proc
@@ -160,8 +160,8 @@
 
 # Workstation Console attachments
 wsdisplay*	at fb?
-wskbd*		at ws? console ?
-wsmouse*	at ws?
+wskbd*		at ws? console ? mux 1
+wsmouse*	at ws? mux 0
 
 # SCSI bus support
 scsibus* at spc?
@@ -169,7 +169,7 @@
 # SCSI devices
 sd* at scsibus? target ? lun ?		# SCSI disks
 st* at scsibus? target ? lun ?		# SCSI tapes
-#cd* at scsibus? target ? lun ?		# SCSI CD-ROMs
+cd* at scsibus? target ? lun ?		# SCSI CD-ROMs
 #ch* at scsibus? target ? lun ?		# SCSI changer devices
 #ss* at scsibus? target ? lun ?		# SCSI scanners
 #uk* at scsibus? target ? lun ?		# unknown SCSI devices
@@ -205,6 +205,8 @@
 pseudo-device	ksyms			# /dev/ksyms
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
+
+pseudo-device	wsmux			# mouse & keyboard multiplexsor
 
 # Veriexec
 #