From 455fcaf146563a802e3915340ee92cac24d5de59 Mon Sep 17 00:00:00 2001
From: Marc Jones <marc.jones@se-eng.com>
Date: Tue, 16 Dec 2014 20:29:27 -0700
Subject: 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@se-eng.com>
Reviewed-on: http://review.coreboot.org/7838
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/drivers/elog/elog.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/drivers')

diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index 7cc7e45aa2..92d5af3b9e 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
-- 
cgit v1.2.3