summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2010-05-02 19:28:30 +0000
committermav <mav@FreeBSD.org>2010-05-02 19:28:30 +0000
commit071496a9c757550fc1834fc2cbdd8d6d142ca23b (patch)
tree313cad23ba9ca263b3b71bc1b75e76aa0bdc6931 /sys/conf
parent9c4f2e9ab2c6f540192e135b002316c170d45a76 (diff)
downloadFreeBSD-src-071496a9c757550fc1834fc2cbdd8d6d142ca23b.zip
FreeBSD-src-071496a9c757550fc1834fc2cbdd8d6d142ca23b.tar.gz
Import mvs(4) - Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA controllers
driver for CAM ATA subsystem. This driver supports same hardware as atamarvell, ataadaptec and atamvsata drivers from ata(4), but provides many additional features, such as NCQ, PMP, etc.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/files3
-rw-r--r--sys/conf/kmod.mk2
3 files changed, 6 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cc1964d..1ec82a9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1660,12 +1660,14 @@ device twe # 3ware ATA RAID
# Serial ATA host controllers:
#
# ahci: Advanced Host Controller Interface (AHCI) compatible
+# mvs: Marvell 88SX50XX/88SX60XX/88SX70XX/SoC controllers
# siis: SiliconImage SiI3124/SiI3132/SiI3531 controllers
#
# These drivers are part of cam(4) subsystem. They supersede less featured
# ata(4) subsystem drivers, supporting same hardware.
device ahci
+device mvs
device siis
#
diff --git a/sys/conf/files b/sys/conf/files
index f4bb062..a485f2f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1293,6 +1293,9 @@ dev/mpt/mpt_pci.c optional mpt pci
dev/mpt/mpt_raid.c optional mpt
dev/mpt/mpt_user.c optional mpt
dev/msk/if_msk.c optional msk inet
+dev/mvs/mvs.c optional mvs
+dev/mvs/mvs_if.m standard
+dev/mvs/mvs_pci.c optional mvs pci
dev/mwl/if_mwl.c optional mwl
dev/mwl/if_mwl_pci.c optional mwl pci
dev/mwl/mwlhal.c optional mwl
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 18bfbb1..c6413d7 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -342,7 +342,7 @@ MFILES?= dev/acpica/acpi_if.m dev/acpi_support/acpi_wmi_if.m \
dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \
dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \
- dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \
+ dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \
dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
OpenPOWER on IntegriCloud