Author: dteske
Date: Wed Apr 30 06:03:01 2014
New Revision: 265131
URL: http://svnweb.freebsd.org/changeset/base/265131
Log:
Merge r144423 with r144497 in-mind. Glue the arcmsr driver into the
stable/4 branch -- but don't build arcmsr on pc98. This is a direct
commit to stable/4 as arcmsr is already hooked into stable/5 and up.
Modified:
stable/4/sys/conf/files.i386
stable/4/sys/i386/conf/GENERIC
stable/4/sys/i386/conf/LINT
stable/4/sys/modules/Makefile
Modified: stable/4/sys/conf/files.i386
==============================================================================
--- stable/4/sys/conf/files.i386 Wed Apr 30 05:59:31 2014
(r265130)
+++ stable/4/sys/conf/files.i386 Wed Apr 30 06:03:01 2014
(r265131)
@@ -91,6 +91,7 @@ crypto/des/des_setkey.c optional
crypt
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
Modified: stable/4/sys/i386/conf/GENERIC
==============================================================================
--- stable/4/sys/i386/conf/GENERIC Wed Apr 30 05:59:31 2014
(r265130)
+++ stable/4/sys/i386/conf/GENERIC Wed Apr 30 06:03:01 2014
(r265131)
@@ -131,6 +131,7 @@ device aac # Adaptec FSA RAID,
Dell PE
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
Modified: stable/4/sys/i386/conf/LINT
==============================================================================
--- stable/4/sys/i386/conf/LINT Wed Apr 30 05:59:31 2014 (r265130)
+++ stable/4/sys/i386/conf/LINT Wed Apr 30 06:03:01 2014 (r265131)
@@ -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
Modified: stable/4/sys/modules/Makefile
==============================================================================
--- stable/4/sys/modules/Makefile Wed Apr 30 05:59:31 2014
(r265130)
+++ stable/4/sys/modules/Makefile Wed Apr 30 06:03:01 2014
(r265131)
@@ -149,6 +149,7 @@ SUBDIR+=ar \
.if ${MACHINE} == "i386"
SUBDIR+=aac \
+ arcmsr \
arl \
asr \
ciss \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
