commit a4cf83df7a3ef3401e12ca3732cbe07294684d02
author Vladimir Serbinenko <phcoder@gmail.com> Tue Jun 02 21:40:29 2015 +0200
committer Vladimir Serbinenko <phcoder@gmail.com> Tue Jun 02 21:48:24 2015 +0200
tree 7b72f5063736eedf59d5e6065a707135b0ac6486
parent 1aeea7fbdf252c95e1e3cdf45339a1430125f85d

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 <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/10403
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)

src/mainboard/iwill/dk8_htx/acpi_tables.c

diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index 834d1fe..5767878 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -170,7 +170,7 @@
 			file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";
 			break;
                 }
-		p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+		p = cbfs_boot_map_with_leak(
 					  file_name,
 					  CBFS_TYPE_RAW, &p_size);
 		if (!p || p_size < sizeof(acpi_header_t))