From: Stefan Reinauer <reinauer@chromium.org>
Date: Fri, 23 Sep 2011 17:24:49 +0000 (-0700)
Subject: Include arch/acpi.h instead of manually adding acpi_slp_type.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=e246b31121df3c15022d108390c389f352c40d81

Include arch/acpi.h instead of manually adding acpi_slp_type.

acpi_slp_type is defined in arch/acpi.h, so let's use that instead
of manually spreading extern u8 acpi_slp_type throughout the code.

Change-Id: Ia5eb420364c15ab5a764bc328bbd201ca9cb7837
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/714
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
---

diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 659784079..f800b0486 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -21,6 +21,9 @@
 #include <string.h>
 #include <cbmem.h>
 #include <console/console.h>
+#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
+#include <arch/acpi.h>
+#endif
 
 // The CBMEM TOC reserves 512 bytes to keep
 // the other entries somewhat aligned.
@@ -199,10 +202,6 @@ void *cbmem_find(u32 id)
 	return (void *)NULL;
 }
 
-#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
-extern u8 acpi_slp_type;
-#endif
-
 #if CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__)
 /* Returns True if it was not intialized before. */
 int cbmem_initialize(void)