9480m_bdw: update from bdw code

2 files changed, 1 insertions, 15 deletions

diff --git a/src/mainboard/hp/folio_9480m_bdw/acpi_tables.c b/src/mainboard/hp/folio_9480m_bdw/acpi_tables.c
index ca6f64b089..e127a56a26 100644
--- a/src/mainboard/hp/folio_9480m_bdw/acpi_tables.c
+++ b/src/mainboard/hp/folio_9480m_bdw/acpi_tables.c
@@ -2,23 +2,9 @@
 
 #include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
-#include <arch/ioapic.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 
 void acpi_create_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-}
-
-unsigned long acpi_fill_madt(unsigned long current)
-{
-	/* Local APICs */
-	current = acpi_create_madt_lapics(current);
-
-	/* IOAPIC */
-	current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
-				2, IO_APIC_ADDR, 0);
-
-	return acpi_madt_irq_overrides(current);
 }
diff --git a/src/mainboard/hp/folio_9480m_bdw/dsdt.asl b/src/mainboard/hp/folio_9480m_bdw/dsdt.asl
index 895d639840..cf76d37885 100644
--- a/src/mainboard/hp/folio_9480m_bdw/dsdt.asl
+++ b/src/mainboard/hp/folio_9480m_bdw/dsdt.asl
@@ -19,7 +19,7 @@ DefinitionBlock(
 
 	Device (\_SB.PCI0)
 	{
-		#include <soc/intel/broadwell/acpi/systemagent.asl>
+		#include <soc/intel/broadwell/acpi/hostbridge.asl>
 		#include <soc/intel/broadwell/pch/acpi/pch.asl>
 	}