diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MSM b/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MSM
deleted file mode 100644
index 7397a0f15..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MSM=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_MSM_OTG b/configs/fedora/generic/arm/aarch64/CONFIG_USB_MSM_OTG
deleted file mode 100644
index 043abcf37..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_USB_MSM_OTG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MSM_OTG=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_QCOM_8X16_PHY b/configs/fedora/generic/arm/aarch64/CONFIG_USB_QCOM_8X16_PHY
deleted file mode 100644
index 79fac4fdc..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_USB_QCOM_8X16_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_QCOM_8X16_PHY=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MSM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
deleted file mode 100644
index 7397a0f15..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MSM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MSM_OTG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MSM_OTG
deleted file mode 100644
index 043abcf37..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MSM_OTG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MSM_OTG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
deleted file mode 100644
index 79fac4fdc..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_QCOM_8X16_PHY=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 6b15480e1..b6b959ea1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5961,7 +5961,6 @@ CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=m
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -6080,7 +6079,6 @@ CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_HDRC=m
@@ -6134,7 +6132,6 @@ CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_PWC=m
 # CONFIG_USB_PXA27X is not set
-CONFIG_USB_QCOM_8X16_PHY=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_R8A66597 is not set
 CONFIG_USB_RAINSHADOW_CEC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c3900be9d..b6e8e9aa2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5938,7 +5938,6 @@ CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=m
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -6057,7 +6056,6 @@ CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_HDRC=m
@@ -6111,7 +6109,6 @@ CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_PWC=m
 # CONFIG_USB_PXA27X is not set
-CONFIG_USB_QCOM_8X16_PHY=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_R8A66597 is not set
 CONFIG_USB_RAINSHADOW_CEC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index e05481570..71bc8524b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6467,7 +6467,6 @@ CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=m
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -6590,7 +6589,6 @@ CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
@@ -6651,7 +6649,6 @@ CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_PWC=m
 # CONFIG_USB_PXA27X is not set
-CONFIG_USB_QCOM_8X16_PHY=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_R8A66597 is not set
 CONFIG_USB_RAINSHADOW_CEC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9530243dc..b93ab1aff 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6444,7 +6444,6 @@ CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=m
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -6567,7 +6566,6 @@ CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
@@ -6628,7 +6626,6 @@ CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_PWC=m
 # CONFIG_USB_PXA27X is not set
-CONFIG_USB_QCOM_8X16_PHY=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_R8A66597 is not set
 CONFIG_USB_RAINSHADOW_CEC=m