diff options
| author | mav <mav@FreeBSD.org> | 2010-05-19 14:50:07 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-05-19 14:50:07 +0000 |
| commit | d3cbefadbba70802e6f66a31e69bdbc2b05d5b46 (patch) | |
| tree | 40ee7fa3ecf870a31b45c23b1eafce2584b8c0f3 /sys/conf | |
| parent | c7a6271f88bca5840c4da4d5ef276061afbef69f (diff) | |
| download | FreeBSD-src-d3cbefadbba70802e6f66a31e69bdbc2b05d5b46.zip FreeBSD-src-d3cbefadbba70802e6f66a31e69bdbc2b05d5b46.tar.gz | |
MFC r207536, r207696, r208183:
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/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 09e2087..27e0521 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1651,12 +1651,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 61e1d64..06565c4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1279,6 +1279,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 optional mvs +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 1c788a3..e424585 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -324,7 +324,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 \ |
