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 a3119e5835

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

@@ -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