From a4cf83df7a3ef3401e12ca3732cbe07294684d02 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 2 Jun 2015 21:40:29 +0200 Subject: cbfs: Fix mismerge. cbfs_get_file_content was replaced with cbfs_boot_map_with_leak but 36f8d27ea9f741e184b76b5f42d7f777f207edc0 failed to get it into account. Change-Id: I0c7840043b2ea6abaf8e70f4bf1a63c96aedebc1 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/10403 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/arch/x86/boot/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arch') diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 03d40d0be3..f0e56ea0e8 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -757,7 +757,7 @@ unsigned long write_acpi_tables(unsigned long start) if (fw) return fw; - dsdt_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, + dsdt_file = cbfs_boot_map_with_leak( CONFIG_CBFS_PREFIX "/dsdt.aml", CBFS_TYPE_RAW, &dsdt_size); if (!dsdt_file) { -- cgit v1.2.3