diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index f02c92dad4..5bf95b22f2 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -2,6 +2,7 @@ if BOARD_EMULATION_QEMU_X86_I440FX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
+	select ACPI_COMMON_MADT_LAPIC
 	select CPU_QEMU_X86
 	select NO_ECAM_MMCONF_SUPPORT
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig
index 08ffb00817..03e70a6394 100644
--- a/src/southbridge/intel/i82371eb/Kconfig
+++ b/src/southbridge/intel/i82371eb/Kconfig
@@ -1,5 +1,4 @@
 config SOUTHBRIDGE_INTEL_I82371EB
-	select ACPI_COMMON_MADT_LAPIC
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
 	select SOUTHBRIDGE_INTEL_COMMON_SMBUS
 	select SOUTHBRIDGE_INTEL_COMMON_RTC