diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index 2374a1f150..a85cde2704 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select HAVE_DEBUG_RAM_SETUP
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select IOMMU
 	select VGA
 	select INTEL_EDID
 	select INTEL_GMA_ACPI
diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc
index 4050296c31..8bb083a0df 100644
--- a/src/northbridge/intel/gm45/Makefile.inc
+++ b/src/northbridge/intel/gm45/Makefile.inc
@@ -31,7 +31,7 @@ romstage-y += thermal.c
 romstage-y += igd.c
 romstage-y += pm.c
 romstage-y += ram_calc.c
-romstage-$(CONFIG_IOMMU) += iommu.c
+romstage-y += iommu.c
 
 ramstage-y += acpi.c
 
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index daa5aedf15..b1cb77314c 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -114,20 +114,16 @@ unsigned long northbridge_write_acpi_tables(device_t device,
 					    struct acpi_rsdp *rsdp)
 {
 	unsigned long current;
-#if CONFIG_IOMMU
 	acpi_dmar_t *dmar;
-#endif
 
 	current = start;
 
-#if CONFIG_IOMMU
 	printk(BIOS_DEBUG, "ACPI:     * DMAR\n");
 	dmar = (acpi_dmar_t *) current;
 	acpi_create_dmar(dmar, acpi_fill_dmar);
 	current += dmar->header.length;
 	ALIGN_CURRENT;
 	acpi_add_table(rsdp, dmar);
-#endif
 
 	ALIGN_CURRENT;