diff options
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 88b8967cd693..5162775df8fd 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -232,8 +232,8 @@ device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # nVidia nForce MCP on-board Ethernet device nge # NatSemi DP83820 gigabit Ethernet -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 +device re # Realtek 8139C+/8169/8169S/8110S +device rl # Realtek 8129/8139 device sge # Silicon Integrated Systems SiS190/191 device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet @@ -249,9 +249,9 @@ device wlan # 802.11 support options IEEE80211_DEBUG # enable debug msgs options IEEE80211_SUPPORT_MESH # enable 802.11s draft support device wlan_wep # 802.11 WEP support +device wlan_tkip # 802.11 TKIP support device wlan_ccmp # 802.11 CCMP support device wlan_gcmp # 802.11 GCMP support -device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support @@ -343,4 +343,3 @@ options HID_DEBUG # enable debug msgs device hid # Generic HID support device hidbus # Generic HID Bus options IICHID_SAMPLING # Workaround missing GPIO INTR support -options U2F_MAKE_UHID_ALIAS # install /dev/uhid alias for /dev/u2f/ diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 93dc00634cc0..fbcea76527db 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -302,6 +302,13 @@ envvar hint.pcf.0.irq="5" # device glxsb # AMD Geode LX Security Block +# +# padlock is a driver for the cryptographic functions and RNG in +# VIA C3, C7, and Eden processors. +# Requires 'device crypto'. +# +device padlock_rng # VIA Padlock RNG + ##################################################################### # ABI Emulation |