diff --git a/configs/surface-4.19.config b/configs/surface-4.19.config
index e53764185..5dfddc0fd 100644
--- a/configs/surface-4.19.config
+++ b/configs/surface-4.19.config
@@ -16,9 +16,13 @@ CONFIG_SURFACE_ACPI_NOTIFY=m
 CONFIG_SURFACE_BATTERY=m
 CONFIG_SURFACE_DTX=m
 CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_HOTPLUG=m
 CONFIG_SURFACE_PERFMODE=m
 
+#
+# Surface Hotplug
+#
+CONFIG_SURFACE_HOTPLUG=m
+
 #
 # Other Drivers
 #
diff --git a/configs/surface-5.10.config b/configs/surface-5.10.config
index ff92d5ddd..fad2cc97b 100644
--- a/configs/surface-5.10.config
+++ b/configs/surface-5.10.config
@@ -10,9 +10,13 @@ CONFIG_SURFACE_ACPI_NOTIFY=m
 CONFIG_SURFACE_BATTERY=m
 CONFIG_SURFACE_DTX=m
 CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_HOTPLUG=m
 CONFIG_SURFACE_PERFMODE=m
 
+#
+# Surface Hotplug
+#
+CONFIG_SURFACE_HOTPLUG=m
+
 #
 # IPTS touchscreen
 #
diff --git a/configs/surface-5.4.config b/configs/surface-5.4.config
index 55937aa53..228797416 100644
--- a/configs/surface-5.4.config
+++ b/configs/surface-5.4.config
@@ -10,9 +10,13 @@ CONFIG_SURFACE_ACPI_NOTIFY=m
 CONFIG_SURFACE_BATTERY=m
 CONFIG_SURFACE_DTX=m
 CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_HOTPLUG=m
 CONFIG_SURFACE_PERFMODE=m
 
+#
+# Surface Hotplug
+#
+CONFIG_SURFACE_HOTPLUG=m
+
 #
 # IPTS touchscreen
 #
diff --git a/configs/surface-5.9.config b/configs/surface-5.9.config
index 285d92703..80d211882 100644
--- a/configs/surface-5.9.config
+++ b/configs/surface-5.9.config
@@ -10,9 +10,13 @@ CONFIG_SURFACE_ACPI_NOTIFY=m
 CONFIG_SURFACE_BATTERY=m
 CONFIG_SURFACE_DTX=m
 CONFIG_SURFACE_HID=m
-CONFIG_SURFACE_HOTPLUG=m
 CONFIG_SURFACE_PERFMODE=m
 
+#
+# Surface Hotplug
+#
+CONFIG_SURFACE_HOTPLUG=m
+
 #
 # IPTS touchscreen
 #