diff options
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 7fc25c93e72..94507911b51 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.395 2004/12/31 00:27:47 jsg Exp $ +# $OpenBSD: GENERIC,v 1.396 2005/01/06 21:32:56 deraadt Exp $ # # GENERIC -- everything that's currently supported # @@ -211,7 +211,7 @@ vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -wskbd* at pckbd? +wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index ab0a0b09d05..36116f2d505 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.133 2004/11/25 22:02:08 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.134 2005/01/06 21:32:56 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -83,7 +83,7 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? +wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA @@ -274,3 +274,4 @@ pseudo-device loop 1 # network loopback #pseudo-device ppp 1 # PPP pseudo-device bpfilter 1 # packet filter pseudo-device rd 1 # ramdisk +pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 9df2f0f3e6d..a1557a0cb15 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.76 2004/11/25 22:02:08 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.77 2005/01/06 21:32:57 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -83,7 +83,7 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? +wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA @@ -295,3 +295,4 @@ pseudo-device loop 1 # network loopback #pseudo-device ppp 1 # PPP pseudo-device bpfilter 1 # packet filter pseudo-device rd 1 # ramdisk +pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index abcbe4c9560..bad0a36a4af 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.45 2005/01/03 21:46:00 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.46 2005/01/06 21:32:57 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -119,7 +119,7 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? +wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 79817020c4f..e175db6d3ee 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.85 2004/12/20 01:06:58 pvalchev Exp $ +# $OpenBSD: RAMDISK_CD,v 1.86 2005/01/06 21:32:57 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -137,7 +137,7 @@ isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? +wskbd* at pckbd? mux 1 vga0 at isa? vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA |