aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Teske <dteske@FreeBSD.org>2014-04-30 06:03:01 +0000
committerDevin Teske <dteske@FreeBSD.org>2014-04-30 06:03:01 +0000
commit509fdeb47ca2325bdf0160d895ed0081aebc7f19 (patch)
treef8c3df26903c3ff14d33953c3316f4999dfcea46
parent59052e0215c9537f3721969f7df8edee2b67295f (diff)
Notes
-rw-r--r--sys/conf/files.i3861
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/i386/conf/LINT6
-rw-r--r--sys/modules/Makefile1
4 files changed, 9 insertions, 0 deletions
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index dcb8ec9192c7..65b9b669a9a2 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -91,6 +91,7 @@ crypto/des/des_setkey.c optional crypto
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/ar/if_ar_isa.c optional ar isa
+dev/arcmsr/arcmsr.c optional arcmsr pci
dev/arl/if_arl.c optional arl
dev/arl/if_arl_isa.c optional arl isa
dev/dgb/dgm.c optional dgm
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 502dd0dbdec6..f3de6395f760 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -131,6 +131,7 @@ device aac # Adaptec FSA RAID, Dell PERC2/PERC3
device ida # Compaq Smart RAID
device ips # IBM/Adaptec ServeRAID
device amr # AMI MegaRAID
+device arcmsr # Areca SATA II RAID
device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
device pst # Promise Supertrak SX6000
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 71fa664d6cfb..ad1f3a0f2ad6 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1276,6 +1276,12 @@ device pst # Promise Supertrak SX6000
device amr # AMI MegaRAID
#
+# Areca 11xx and 12xx series of SATA II RAID controllers.
+# CAM is required.
+#
+device arcmsr # Areca SATA II RAID
+
+#
# 3ware ATA RAID
#
device twe # 3ware ATA RAID
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 60d2be4664b2..7008bc4b0157 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -149,6 +149,7 @@ SUBDIR+=ar \
.if ${MACHINE} == "i386"
SUBDIR+=aac \
+ arcmsr \
arl \
asr \
ciss \