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/mvmeppc/conf | |
| parent | a0bbe5baf821963522edd04f536509b4351ca7ab (diff) | |
Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.
Diffstat (limited to 'sys/arch/mvmeppc/conf')
| -rw-r--r-- | sys/arch/mvmeppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/conf/RAMDISK | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index 90108234e3b..8aec953ebfc 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: GENERIC,v 1.12 2010/09/26 20:39:08 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -53,7 +53,6 @@ isa* at pcib? #pckbc0 at isa? # 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? #vga* at pci? #com* at isa? port 0x3f8 irq 4 # standard serial ports diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index 4372c76699f..e2d18eeb903 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.12 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: RAMDISK,v 1.13 2010/09/26 20:39:08 miod Exp $ # # MVMEPPC GENERIC config file # @@ -49,7 +49,6 @@ isa* at pcib? #pckbc0 at isa? # 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? #vga* at pci? #com* at isa? port 0x3f8 irq 4 # standard serial ports |