summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorjimharris <jimharris@FreeBSD.org>2012-01-31 00:12:51 +0000
committerjimharris <jimharris@FreeBSD.org>2012-01-31 00:12:51 +0000
commite8263c4e27b8d101f2bdc08c6172a3ac3ffcebc0 (patch)
treebee289bfd388d943ca586efbfc3ad0e0710a39fc /sys/conf
parent829d20bae62c17797f4e0bcf261457818e9cbfd2 (diff)
parentda7d786fd42cccabf9a0a984972ae8d78c1d61fa (diff)
downloadFreeBSD-src-e8263c4e27b8d101f2bdc08c6172a3ac3ffcebc0.zip
FreeBSD-src-e8263c4e27b8d101f2bdc08c6172a3ac3ffcebc0.tar.gz
Rebase user/jimharris/isci branch from head.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 85c87b0..b777ccd 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1395,6 +1395,8 @@ dev/ixgbe/ixgbe_82598.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_82599.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_x540.c optional ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/jme/if_jme.c optional jme pci
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
@@ -1469,8 +1471,11 @@ dev/mmc/mmcbus_if.m standard
dev/mmc/mmcsd.c optional mmcsd
dev/mn/if_mn.c optional mn pci
dev/mps/mps.c optional mps
+dev/mps/mps_config.c optional mps
+dev/mps/mps_mapping.c optional mps
dev/mps/mps_pci.c optional mps pci
dev/mps/mps_sas.c optional mps
+dev/mps/mps_sas_lsi.c optional mps
dev/mps/mps_table.c optional mps
dev/mps/mps_user.c optional mps
dev/mpt/mpt.c optional mpt
OpenPOWER on IntegriCloud