[coreboot-gerrit] New patch to review for coreboot: f75d9a0 elog: Fix chromium merge issue

Marc Jones (marc.jones@se-eng.com) gerrit at coreboot.org
Wed Dec 17 04:44:51 CET 2014


Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7838

-gerrit

commit f75d9a09fb91f2ecc03933d9aa0be59992a5b617
Author: Marc Jones <marc.jones at se-eng.com>
Date:   Tue Dec 16 20:29:27 2014 -0700

    elog: Fix chromium merge issue
    
    This cleans up a mis-merge in elog.c and puts the following
    change back:
    
    drivers/elog: Unmangle header include out of pre-proc cond
    commit a3119e5835e4b8fd510d046c56a3bf2bf43a5c0d
    
    Change-Id: Iafbbd381efdb103717022d2a3c342da376a9428f
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
---
 src/drivers/elog/elog.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index 7cc7e45a..92d5af3 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -33,7 +33,6 @@
 #include <elog.h>
 #include "elog_internal.h"
 
-#if CONFIG_CHROMEOS
 #include <vendorcode/google/chromeos/fmap.h>
 
 #if CONFIG_ELOG_FLASH_BASE == 0



More information about the coreboot-gerrit mailing list