Change in coreboot[master]: soc/intel/apollolake: Use common ACPI for apollolake

[Shaunak Saha (Code Review)]

Shaunak Saha has uploaded this change for review. ( https://review.coreboot.org/20949

Change subject: soc/intel/apollolake: Use common ACPI for apollolake
......................................................................

soc/intel/apollolake: Use common ACPI for apollolake

Change-Id: I10e3fb74133dd499e9e74d95a909d33daaf098ec
Signed-off-by: Shaunak Saha 
---
D src/soc/intel/apollolake/include/soc/acpi.h
M src/soc/intel/apollolake/lpc.c
2 files changed, 1 insertion(+), 29 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/20949/1

diff --git a/src/soc/intel/apollolake/include/soc/acpi.h b/src/soc/intel/apollolake/include/soc/acpi.h
deleted file mode 100644
index ba3b8fc..0000000
--- a/src/soc/intel/apollolake/include/soc/acpi.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2016 Intel Corp.
- * (Written by Lance Zhao  for Intel Corp.)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _SOC_APOLLOLAKE_ACPI_H_
-#define _SOC_APOLLOLAKE_ACPI_H_
-
-#include <arch/acpi.h>
-
-unsigned long southbridge_write_acpi_tables(device_t device,
-		unsigned long current, struct acpi_rsdp *rsdp);
-
-void southbridge_inject_dsdt(device_t device);
-
-#endif	/* _SOC_APOLLOLAKE_ACPI_H_ */
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index 67c87b1..1cb118b 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -20,8 +20,8 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <intelblocks/acpi.h>
 #include <pc80/mc146818rtc.h>
-#include <soc/acpi.h>
 #include <soc/lpc.h>
 #include <soc/pm.h>
 #include <vboot/vbnv.h>