diff options
author | obrien <obrien@FreeBSD.org> | 2013-07-31 17:21:18 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2013-07-31 17:21:18 +0000 |
commit | 7999076e3e464a2dd3a7abc86d14b874da837ec0 (patch) | |
tree | 0214e6338a2fb9904fb96b90f6c2f84d17e742a0 /sys/amd64 | |
parent | a8df631d0527c68753a33443af52e11b08ebde5d (diff) | |
download | FreeBSD-src-7999076e3e464a2dd3a7abc86d14b874da837ec0.zip FreeBSD-src-7999076e3e464a2dd3a7abc86d14b874da837ec0.tar.gz |
Back out r253779 & r253786.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/conf/GENERIC | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index dbd76d6..17990a3 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -295,7 +295,6 @@ device loop # Network loopback device random # Entropy device options PADLOCK_RNG # VIA Padlock RNG options RDRAND_RNG # Intel Bull Mountain RNG -options YARROW_RNG # Yarrow software RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. |