diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -247,6 +247,11 @@
 device		hdmi
 device		vchiq
 
+# IMX6 HDMI Controller
+device		dwc_hdmi
+device		imx6_hdmi
+device		imx6_ipu
+
 # Pinmux
 device		fdt_pinctrl
 
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -23,10 +23,10 @@
 arm/freescale/imx/imx6_ssi.c		optional sound fslsdma
 arm/freescale/imx/imx6_ahci.c		optional ahci
 
-dev/hdmi/dwc_hdmi.c			optional hdmi
-arm/freescale/imx/imx6_hdmi.c		optional hdmi
+dev/hdmi/dwc_hdmi.c			optional vt dwc_hdmi
+arm/freescale/imx/imx6_hdmi.c		optional vt imx6_hdmi
 
-arm/freescale/imx/imx6_ipu.c		optional	vt
+arm/freescale/imx/imx6_ipu.c		optional vt imx6_ipu
 
 #
 # Optional devices.