diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/amd64/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 4 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 4 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 |
6 files changed, 8 insertions, 12 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3068a8a0..08865a8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -293,8 +293,8 @@ device wpi # Intel 3945ABG wireless NICs. # Pseudo devices. device loop # Network loopback device random # Entropy device -options PADLOCK_RNG # VIA Padlock RNG -options RDRAND_RNG # Intel Bull Mountain RNG +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 7d58541..95d4ce0 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -496,6 +496,8 @@ device vpd device asmc #device si device tpm +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG # # Laptop/Notebook options: diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 90348b7..31d1650 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -68,7 +68,3 @@ XENHVM opt_global.h # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h - -# hw random number generators for random(4) -PADLOCK_RNG opt_cpu.h -RDRAND_RNG opt_cpu.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 059a637..3638266 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -123,7 +123,3 @@ XENHVM opt_global.h # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h - -# hw random number generators for random(4) -PADLOCK_RNG opt_cpu.h -RDRAND_RNG opt_cpu.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 7e8bb90..5e6bfd5 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -307,8 +307,8 @@ device wpi # Intel 3945ABG wireless NICs. # Pseudo devices. device loop # Network loopback device random # Entropy device -options PADLOCK_RNG # VIA Padlock RNG -options RDRAND_RNG # Intel Bull Mountain RNG +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 36744ab..3cb1264 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -850,6 +850,8 @@ hint.spic.0.port="0x10a0" device asmc #device si device tpm +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG # # Laptop/Notebook options: |
