diff options
author | Renato Botelho <renato@netgate.com> | 2018-02-28 15:38:50 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2018-02-28 15:38:50 -0300 |
commit | d2b8cd7dc6109dc1ef4fd0c7d4e286c1991a0cd2 (patch) | |
tree | bfb503279b418520244e591f1b244e78b0f64615 /sys/conf/files | |
parent | 6f7620f10bfc729200a91dd6bc3b8f2bbe402d92 (diff) | |
parent | bbba0c05b6b34dba4485c130b549de8d35599fe3 (diff) | |
download | FreeBSD-src-d2b8cd7dc6109dc1ef4fd0c7d4e286c1991a0cd2.zip FreeBSD-src-d2b8cd7dc6109dc1ef4fd0c7d4e286c1991a0cd2.tar.gz |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/conf/files')
-rw-r--r-- | sys/conf/files | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/conf/files b/sys/conf/files index aeebb47..59351b2 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2164,6 +2164,7 @@ dev/ixgbe/ixgbe_dcb_82598.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb_82599.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/jedec_dimm/jedec_dimm.c optional jedec_dimm smbus dev/jedec_ts/jedec_ts.c optional jedec_ts smbus dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy |