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/sparc64/conf/GENERIC | |
| parent | a0bbe5baf821963522edd04f536509b4351ca7ab (diff) | |
Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.
Diffstat (limited to 'sys/arch/sparc64/conf/GENERIC')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 458661d65d0..ba108e7a778 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.257 2010/09/24 07:23:00 dlg Exp $ +# $OpenBSD: GENERIC,v 1.258 2010/09/26 20:39:08 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -300,8 +300,6 @@ pckbd* at pckbc? # ps2 keyboard wskbd* at pckbd? mux 1 # generic keyboard layer pms* at pckbc? # ps2 mouse wsmouse* at pms? mux 0 # generic mouse -pmsi* at pckbc? # ps2 "intelli"mouse -wsmouse* at pmsi? mux 0 # generic mouse audioce* at ebus? # ebus cs4231 |