diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c1cd3f2d8..525cce29d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1181,7 +1181,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 CONFIG_DM9102=m
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 3384fb812..4bfa3935a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1243,7 +1243,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index ec766c062..da3311cdb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1191,7 +1191,7 @@ CONFIG_DLM_DEBUG=y
 CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 26685d2db..cc31234c3 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1167,7 +1167,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 279602f9d..c896b6ab1 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1178,7 +1178,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c32b00dad..8541ed4cb 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1178,7 +1178,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 25f1d5c42..ced2e266a 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1167,7 +1167,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 02fc94229..5b46187aa 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1218,7 +1218,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -4089,7 +4089,7 @@ CONFIG_QUOTA=y
 CONFIG_R3964=m
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
 CONFIG_RADIO_ADAPTERS=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 37220c151..67b01320c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1207,7 +1207,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -4068,7 +4068,7 @@ CONFIG_QUOTA=y
 CONFIG_R3964=m
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
 CONFIG_RADIO_ADAPTERS=y