summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-09-20 20:34:17 +0000
committerdim <dim@FreeBSD.org>2015-09-20 20:34:17 +0000
commit18b14b4a2fd66af5fcf07d469fe45b32b2c0be76 (patch)
tree6068d0c9297482b6c68c78d37d113e16d44371c0 /sys/conf
parent7b8be099124cf3848a48077ce37206e0ae691839 (diff)
parente5a64a53e6f41e1fb2f62f6b0fdfdbe1b7d5f5b0 (diff)
downloadFreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.zip
FreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.tar.gz
Merge ^/head r287878 through r288034.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.arm2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 743fd86..8f03809 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -84,6 +84,8 @@ cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
+dev/dwc/if_dwc.c optional dwc
+dev/dwc/if_dwc_if.m optional dwc
dev/fb/fb.c optional sc
dev/fdt/fdt_arm_platform.c optional platform fdt
dev/hwpmc/hwpmc_arm.c optional hwpmc
OpenPOWER on IntegriCloud