summaryrefslogtreecommitdiffstats
path: root/sys/conf/files.amd64
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2014-05-16 21:56:33 +0000
committersbruno <sbruno@FreeBSD.org>2014-05-16 21:56:33 +0000
commitebb52114cf1aa84c06d0ab3acef6f36785f31861 (patch)
treee352def97b15ed43cab211eaae322dcec681e70f /sys/conf/files.amd64
parent81a04e5982f8e2a0559199cee636afbbaae07df1 (diff)
downloadFreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.zip
FreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.tar.gz
MFC r264269, r264282, r264280, r264291, r264276, r264314
Merge sson's binmiscctl and image activator features to stable/10 Submitted by: sson@freebsd.org
Diffstat (limited to 'sys/conf/files.amd64')
-rw-r--r--sys/conf/files.amd641
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index d1bdcd9..84b6e6b 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -450,6 +450,7 @@ dev/virtio/balloon/virtio_balloon.c optional virtio_balloon
dev/virtio/scsi/virtio_scsi.c optional virtio_scsi
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
+kern/imgact_binmisc.c optional imagact_binmisc
kern/kern_clocksource.c standard
kern/link_elf_obj.c standard
#
OpenPOWER on IntegriCloud