diff --git a/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET b/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET
deleted file mode 100644
index 2af33e19f..000000000
--- a/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GEMINI_ETHERNET=m
diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA
deleted file mode 100644
index 4dbaa1244..000000000
--- a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NET_VENDOR_CORTINA=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e76de4945..3ec616937 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1752,7 +1752,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3624,7 +3623,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 3223e2379..cdafb3629 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1733,7 +1733,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3601,7 +3600,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4fc2232ce..fb12c21ca 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1865,7 +1865,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3858,7 +3857,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 9ab9620a9..467c46ae5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1770,7 +1770,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3682,7 +3681,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ef552df47..a1adeb5d8 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1751,7 +1751,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3659,7 +3658,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index c2bdb7bb4..640f0472e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1846,7 +1846,6 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -3835,7 +3834,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y