diff options
author | mav <mav@FreeBSD.org> | 2015-03-12 13:40:02 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-03-12 13:40:02 +0000 |
commit | 24b691f7111d3c0dcbe192f203a94b883de680de (patch) | |
tree | d3c5c93b95f0efbd6bf01ff27f0e3976e7d9f3c6 /sys/conf/files | |
parent | 19c51041e76489eebb60a5f32f2cbab750826a8c (diff) | |
download | FreeBSD-src-24b691f7111d3c0dcbe192f203a94b883de680de.zip FreeBSD-src-24b691f7111d3c0dcbe192f203a94b883de680de.tar.gz |
MFC r271146,271201,271207,271261,271457,272606,277100,277126,278034,279320,
279573: Sync AHCI driver with HEAD.
Due to code reorganization in r271146 and many previous reordered merges it
is problematic to merge those revisions separately.
Diffstat (limited to 'sys/conf/files')
-rw-r--r-- | sys/conf/files | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files index ae19e91..11ebd01 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -621,8 +621,9 @@ dev/aha/aha.c optional aha dev/aha/aha_isa.c optional aha isa dev/aha/aha_mca.c optional aha mca dev/ahb/ahb.c optional ahb eisa -dev/ahci/ahci.c optional ahci pci -dev/ahci/ahciem.c optional ahci pci +dev/ahci/ahci.c optional ahci +dev/ahci/ahciem.c optional ahci +dev/ahci/ahci_pci.c optional ahci pci dev/aic/aic.c optional aic dev/aic/aic_pccard.c optional aic pccard dev/aic7xxx/ahc_eisa.c optional ahc eisa |