summaryrefslogtreecommitdiffstats
path: root/sys/conf/NOTES
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-26 09:57:18 -0300
committerRenato Botelho <renato@netgate.com>2015-08-26 09:57:18 -0300
commitdb675751fbe2719e40d2d9e7ca50d71ac7871b1d (patch)
tree439ea42c110371603c2eb536c881c81d6f9a8c46 /sys/conf/NOTES
parent3a1ead7396ada9e53eaee9dd7d1a1db12690488a (diff)
parente3e10fb92a1524019f130fd5982a6694f2cc3741 (diff)
downloadFreeBSD-src-db675751fbe2719e40d2d9e7ca50d71ac7871b1d.zip
FreeBSD-src-db675751fbe2719e40d2d9e7ca50d71ac7871b1d.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/conf/NOTES')
-rw-r--r--sys/conf/NOTES2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 507137d..d3f1a8d 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1720,10 +1720,8 @@ device ata
#device atapci # PCI bus support; only generic chipset support
# PCI ATA chipsets
-#device ataahci # AHCI SATA
#device ataacard # ACARD
#device ataacerlabs # Acer Labs Inc. (ALI)
-#device ataadaptec # Adaptec
#device ataamd # American Micro Devices (AMD)
#device ataati # ATI
#device atacenatek # Cenatek
OpenPOWER on IntegriCloud