Index: head/sys/arm/allwinner/files.allwinner
===================================================================
--- head/sys/arm/allwinner/files.allwinner	(revision 327250)
+++ head/sys/arm/allwinner/files.allwinner	(revision 327251)
@@ -1,61 +1,60 @@
 # $FreeBSD$
 
 arm/allwinner/a10_ahci.c		optional	ahci
 arm/allwinner/a10_codec.c		optional	sound
 arm/allwinner/a10_dmac.c		standard
 arm/allwinner/a31_dmac.c		standard
 arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/a10_sramc.c		standard
 arm/allwinner/aw_gpio.c			optional	gpio
 arm/allwinner/aw_if_dwc.c		optional	dwc
 arm/allwinner/aw_machdep.c		standard
 arm/allwinner/aw_mmc.c			optional	mmc
 arm/allwinner/aw_mp.c			optional	smp
 arm/allwinner/aw_nmi.c			optional	intrng
 arm/allwinner/aw_rsb.c			optional	rsb | p2wi
 arm/allwinner/aw_rtc.c			standard
 arm/allwinner/aw_ts.c			standard
 arm/allwinner/aw_usbphy.c		optional	ehci | ohci
 arm/allwinner/aw_wdog.c			standard
 arm/allwinner/axp209.c			optional	axp209
 arm/allwinner/axp81x.c			optional	axp81x
 arm/allwinner/if_awg.c			optional	awg
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/sunxi_dma_if.m		standard
 dev/iicbus/twsi/a10_twsi.c		optional	twsi
 dev/usb/controller/generic_ohci.c	optional	ohci
 dev/usb/controller/generic_usb_if.m	optional	ohci
 arm/allwinner/aw_sid.c			standard
 arm/allwinner/aw_thermal.c		standard
 dev/iicbus/sy8106a.c			optional	sy8106a
 arm/allwinner/aw_cir.c			optional	aw_cir evdev
 
 arm/allwinner/a10_fb.c			optional	vt
 arm/allwinner/a10_hdmi.c		optional	hdmi
 arm/allwinner/a10_hdmiaudio.c		optional	hdmi sound
-dev/hdmi/hdmi_if.m			optional	hdmi
 
 arm/allwinner/aw_reset.c		standard
 arm/allwinner/aw_ccu.c			standard
 arm/allwinner/clk/aw_ahbclk.c		standard
 arm/allwinner/clk/aw_apbclk.c		standard
 arm/allwinner/clk/aw_axiclk.c		standard
 arm/allwinner/clk/aw_codecclk.c		standard
 arm/allwinner/clk/aw_cpuclk.c		standard
 arm/allwinner/clk/aw_cpusclk.c		standard
 arm/allwinner/clk/aw_debeclk.c		standard
 arm/allwinner/clk/aw_gate.c		standard
 arm/allwinner/clk/aw_gmacclk.c		standard
 arm/allwinner/clk/aw_hdmiclk.c		standard
 arm/allwinner/clk/aw_lcdclk.c		standard
 arm/allwinner/clk/aw_modclk.c		standard
 arm/allwinner/clk/aw_mmcclk.c		standard
 arm/allwinner/clk/aw_oscclk.c		standard
 arm/allwinner/clk/aw_pll.c		standard
 arm/allwinner/clk/aw_thsclk.c		standard
 arm/allwinner/clk/aw_usbclk.c		standard
 
 arm/allwinner/clkng/aw_ccung.c		standard
 arm/allwinner/clkng/aw_clk_nkmp.c	standard
 arm/allwinner/clkng/aw_clk_nm.c		standard
 arm/allwinner/clkng/aw_clk_prediv_mux.c	standard
Index: head/sys/arm/freescale/imx/files.imx6
===================================================================
--- head/sys/arm/freescale/imx/files.imx6	(revision 327250)
+++ head/sys/arm/freescale/imx/files.imx6	(revision 327251)
@@ -1,69 +1,68 @@
 # $FreeBSD$
 
 #
 # Standard imx6 devices and support.
 #
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard
 arm/freescale/imx/imx6_ccm.c		standard
 arm/freescale/imx/imx6_machdep.c	standard
 arm/freescale/imx/imx6_mp.c		optional smp
 arm/freescale/imx/imx6_pl310.c		standard
 arm/freescale/imx/imx6_snvs.c		optional imx6_snvs
 arm/freescale/imx/imx6_src.c		standard
 arm/freescale/imx/imx_epit.c		standard
 arm/freescale/imx/imx_iomux.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx_gpt.c		optional imx_gpt
 arm/freescale/imx/imx_gpio.c		optional gpio
 arm/freescale/imx/imx_i2c.c		optional fsliic
 arm/freescale/imx/imx6_sdma.c		optional fslsdma
 arm/freescale/imx/imx6_audmux.c		optional sound
 arm/freescale/imx/imx6_ssi.c		optional sound
 arm/freescale/imx/imx6_ahci.c		optional ahci
 
-dev/hdmi/hdmi_if.m			optional hdmi
 dev/hdmi/dwc_hdmi.c			optional hdmi
 arm/freescale/imx/imx6_hdmi.c		optional hdmi
 
 arm/freescale/imx/imx6_ipu.c		optional	vt
 
 #
 # Optional devices.
 #
 dev/sdhci/fsl_sdhci.c			optional sdhci
 
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 dev/ffec/if_ffec.c			optional ffec
 
 dev/uart/uart_dev_imx.c			optional uart
 
 dev/usb/controller/ehci_imx.c		optional ehci
 arm/freescale/imx/imx6_usbphy.c		optional ehci
 
 #
 # Low-level serial console for debugging early kernel startup.
 #
 #arm/freescale/imx/imx_console.c  	standard
 
 #
 # Not ready yet...
 #
 #arm/freescale/imx/imx51_ipuv3.c  	optional sc
 
 # SDMA firmware
 sdma_fw.c				optional sdma_fw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk sdma-imx6q-to1.bin:sdma_fw -msdma -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"sdma_fw.c"
 sdma-imx6q-to1.fwo			optional sdma_fw		\
 	dependency	"sdma-imx6q-to1.bin"				\
 	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} sdma-imx6q-to1.bin" \
 	no-implicit-rule						\
 	clean		"sdma-imx6q-to1.fwo"
 sdma-imx6q-to1.bin			optional sdma_fw		\
 	dependency	"$S/contrib/dev/imx/sdma-imx6q-to1.bin.uu"	\
 	compile-with	"uudecode < $S/contrib/dev/imx/sdma-imx6q-to1.bin.uu" \
 	no-obj no-implicit-rule						\
 	clean		"sdma-imx6q-to1.bin"