diff options
| author | marius <marius@FreeBSD.org> | 2008-08-23 14:17:00 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2008-08-23 14:17:00 +0000 |
| commit | e7f32da60c7604abdce7808278d857e6ec6fe989 (patch) | |
| tree | 86daf15c0c691f9c49db8ed53ab0e61a8c9cd64b /sys/sparc64 | |
| parent | b738ca88a2a505f7f334b2e83a3b29f249bedf4b (diff) | |
| download | FreeBSD-src-e7f32da60c7604abdce7808278d857e6ec6fe989.zip FreeBSD-src-e7f32da60c7604abdce7808278d857e6ec6fe989.tar.gz | |
- Add kbdmux(4); since sunkbd(4) was tought to emulate atkbd(4) like
ukbd(4) does and that emulation was enabled by default, all three of
them work together with kbdmux(4) out of the box just fine.
- Fix some whitespace bugs.
MFC after: 3 days
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/conf/GENERIC | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index b2a0bdf..830cc19 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -128,6 +128,8 @@ device atkbdc # AT keyboard controller device atkbd # AT keyboard device psm # PS/2 mouse +device kbdmux # keyboard multiplexer + # syscons is the default console driver, resembling an SCO console device sc device creator # Creator, Creator3D and Elite3D framebuffers @@ -157,7 +159,7 @@ device uart # Multi-uart driver #device plip # TCP/IP over parallel #device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # PCI Ethernet NICs. #device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card @@ -192,8 +194,8 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # Wireless NIC cards device wlan # 802.11 support -options IEEE80211_DEBUG # enable debug msgs -options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support |
