diff --git a/config/kernel/linux-mvebu-current.config b/config/kernel/linux-mvebu-current.config
index 1508002ce..12ab4f515 100644
--- a/config/kernel/linux-mvebu-current.config
+++ b/config/kernel/linux-mvebu-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.94 Kernel Configuration
+# Linux/arm 4.19.107 Kernel Configuration
 #
 
 #
@@ -2582,7 +2582,7 @@ CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
 CONFIG_RTL8821CU=m
-CONFIG_RTL8812AU=m
+CONFIG_88XXAU=m
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
diff --git a/config/kernel/linux-mvebu-legacy.config b/config/kernel/linux-mvebu-legacy.config
index 5fd558074..b06a9ab79 100644
--- a/config/kernel/linux-mvebu-legacy.config
+++ b/config/kernel/linux-mvebu-legacy.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.135 Kernel Configuration
+# Linux/arm 4.14.172 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -593,7 +593,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
-CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -2486,7 +2485,12 @@ CONFIG_RTL8XXXU_UNTESTED=y
 # CONFIG_WLAN_VENDOR_TI is not set
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
+<<<<<<< HEAD
 CONFIG_RTL8812AU=m
+=======
+CONFIG_RTL8821CU=m
+CONFIG_88XXAU=m
+>>>>>>> fe9a1867... [ mvebu ] Update kernel configurations
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m