summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2006-03-29 09:57:22 +0000
committerscottl <scottl@FreeBSD.org>2006-03-29 09:57:22 +0000
commit725c458dc3c955d4c00950e6f75c002daba487aa (patch)
tree628e3a27a935f39f291ada85837cb7ec0266d060
parent4b284418b15d60db15b0b20e760ac80bd086879d (diff)
downloadFreeBSD-src-725c458dc3c955d4c00950e6f75c002daba487aa.zip
FreeBSD-src-725c458dc3c955d4c00950e6f75c002daba487aa.tar.gz
Hook the MFI driver up to the build.
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/files3
-rw-r--r--sys/conf/options1
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/modules/Makefile1
6 files changed, 8 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index feda823..6d3c991 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -137,6 +137,7 @@ device twa # 3ware 9000 series PATA/SATA RAID
device aac # Adaptec FSA RAID
device aacp # SCSI passthrough for aac (requires CAM)
device ida # Compaq Smart RAID
+device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
#XXX pointer/int warnings
#device pst # Promise Supertrak SX6000
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 12398cc..0e9c754 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1542,6 +1542,7 @@ device mly
device ida # Compaq Smart RAID
device mlx # Mylex DAC960
device amr # AMI MegaRAID
+device mfi # LSI MegaRAID SAS
#
# 3ware ATA RAID
diff --git a/sys/conf/files b/sys/conf/files
index 688b826..70a5011 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -697,6 +697,9 @@ dev/mcd/mcd.c optional mcd isa nowerror
dev/mcd/mcd_isa.c optional mcd isa nowerror
dev/md/md.c optional md
dev/mem/memdev.c optional mem
+dev/mfi/mfi.c optional mfi
+dev/mfi/mfi_pci.c optional mfi pci
+dev/mfi/mfi_disk.c optional mfi
dev/mii/acphy.c optional miibus | acphy
dev/mii/amphy.c optional miibus | amphy
dev/mii/bmtphy.c optional miibus | bmtphy
diff --git a/sys/conf/options b/sys/conf/options
index 33b7c98..3ed1ea6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -115,6 +115,7 @@ MAC_STUB opt_dontuse.h
MAC_TEST opt_dontuse.h
MD_ROOT opt_md.h
MD_ROOT_SIZE opt_md.h
+MFI_DEBUG opt_mfi.h
MPROF_BUFFERS opt_mprof.h
MPROF_HASH_SIZE opt_mprof.h
MUTEX_WAKE_ALL
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3e02b75..70ab09d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -140,6 +140,7 @@ device twa # 3ware 9000 series PATA/SATA RAID
device aac # Adaptec FSA RAID
device aacp # SCSI passthrough for aac (requires CAM)
device ida # Compaq Smart RAID
+device mfi # LSI MegaRAID SAS
device mlx # Mylex DAC960 family
device pst # Promise Supertrak SX6000
device twe # 3ware ATA RAID
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 411ead6..80a4ee1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -152,6 +152,7 @@ SUBDIR= ${_3dfx} \
mcd \
md \
mem \
+ mfi \
mii \
mlx \
${_mly} \
OpenPOWER on IntegriCloud