Index: head/sys/arm/conf/VIRT
===================================================================
--- head/sys/arm/conf/VIRT	(revision 282716)
+++ head/sys/arm/conf/VIRT	(revision 282717)
@@ -1,65 +1,68 @@
 #
 # VIRT -- Custom configuration for the qemu virt platform
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 ident		VIRT
 
 include 	"std.armv6"
 include 	"../qemu/std.virt"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	BREAK_TO_DEBUGGER
 options 	ALT_BREAK_TO_DEBUGGER
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
 options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			# Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
+# Interrupt controller
+device		gic
+
 device		bpf
 device		loop
 device		ether
 device		uart
 device		pty
 device		snp
 device		pl011
 device		psci
 
-device		virtio                                                                                                                                           
-device		virtio_mmio                                                                                                                                      
-device		virtio_blk                                                                                                                                       
+device		virtio
+device		virtio_mmio
+device		virtio_blk
 device		vtnet
 
 device		md
 device		random			# Entropy device
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 
Index: head/sys/arm/qemu/files.qemu
===================================================================
--- head/sys/arm/qemu/files.qemu	(revision 282716)
+++ head/sys/arm/qemu/files.qemu	(revision 282717)
@@ -1,16 +1,15 @@
 # $FreeBSD$
 
 #
 # Standard ARM support.
 #
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 #
 # Standard qemu virt devices and support.
 #
-arm/arm/gic.c				standard
 arm/arm/generic_timer.c			standard
 arm/qemu/virt_common.c			standard
 arm/qemu/virt_machdep.c			standard