diff --git a/configs/fedora/generic/x86/CONFIG_THUNDERBOLT_NET b/configs/fedora/generic/x86/CONFIG_THUNDERBOLT_NET
deleted file mode 100644
index 1cfc06a79..000000000
--- a/configs/fedora/generic/x86/CONFIG_THUNDERBOLT_NET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDERBOLT_NET=m
diff --git a/configs/fedora/generic/x86/CONFIG_EFI_RCI2_TABLE b/configs/fedora/generic/x86/x86_64/CONFIG_EFI_RCI2_TABLE
similarity index 100%
rename from configs/fedora/generic/x86/CONFIG_EFI_RCI2_TABLE
rename to configs/fedora/generic/x86/x86_64/CONFIG_EFI_RCI2_TABLE
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 147db7233..d5a138b67 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1511,7 +1511,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_RCI2_TABLE=y
+# CONFIG_EFI_RCI2_TABLE is not set
 CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
@@ -5926,7 +5926,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index ef96ead21..151ca94e1 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1502,7 +1502,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
-CONFIG_EFI_RCI2_TABLE=y
+# CONFIG_EFI_RCI2_TABLE is not set
 CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
@@ -5905,7 +5905,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5b723a745..250d0e3de 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5981,7 +5981,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index ae53caeb7..791116f75 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5960,7 +5960,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set