diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2014-12-16 20:29:27 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2014-12-17 20:51:21 +0100 |
| commit | 455fcaf146563a802e3915340ee92cac24d5de59 (patch) | |
| tree | ee14666b640fefdd8c369efa8d49a524a6deb717 /src/drivers/elog/elog.c | |
| parent | 59e209af890a7e58f4c74718a2dec567bbd0d58e (diff) | |
| download | coreboot-455fcaf146563a802e3915340ee92cac24d5de59.tar.xz | |
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>
Diffstat (limited to 'src/drivers/elog/elog.c')
| -rw-r--r-- | src/drivers/elog/elog.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 |