summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-09-23 10:24:49 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-03-28 20:44:55 +0200
commite246b31121df3c15022d108390c389f352c40d81 (patch)
tree24d0bdb8ede3131fb7096b9cea6b15e06a44efd5
parent6f72d6965c7c54df663f2337e6154daf4dd464ff (diff)
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>
-rw-r--r--src/lib/cbmem.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 659784079b..f800b04866 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)