diff options
author | emax <emax@FreeBSD.org> | 2006-04-04 17:03:44 +0000 |
---|---|---|
committer | emax <emax@FreeBSD.org> | 2006-04-04 17:03:44 +0000 |
commit | 2a40fc7d0aee73209265bae2146a9f39f4eab9fc (patch) | |
tree | 682eef36395429976545c2e9c1ec1531490080b8 /sys/amd64/conf | |
parent | 0c9e2e4dab0b9eab231940f2bd3169084ae8c605 (diff) | |
download | FreeBSD-src-2a40fc7d0aee73209265bae2146a9f39f4eab9fc.zip FreeBSD-src-2a40fc7d0aee73209265bae2146a9f39f4eab9fc.tar.gz |
MFC:
Add kbdmux(4) to GENERIC on i386 and amd64.
Remove the USB keyboard hack now that KBDMUX is enabled by default.
Allow it to be disabled if Safe Mode is selected.
Requested by: scottl
Approved by: re (scottl)
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r-- | sys/amd64/conf/GENERIC | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ef16c64..f830753 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -138,6 +138,8 @@ device atkbdc # AT keyboard controller device atkbd # AT keyboard device psm # PS/2 mouse +device kbdmux # keyboard multiplexer + device vga # VGA video card driver device splash # Splash screen and screen saver support |