diff --git a/src/Makefile b/src/Makefile
index 66e823d7a9..b97f122040 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -435,7 +435,7 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,)
 # set in the environment
 # Also any assignments in arch/$(ARCH)/Makefile take precedence over
 # this default value
-export LBBUILD_IMAGE ?= linuxbios.rom startup_code.rom 
+export LBBUILD_IMAGE ?= linuxbios.rom startup_code.rom
 
 
 core-y := mainboard/$(MAINBOARD)/
diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c
index 485212590e..3f85ae91f0 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-i386/mainboard.c
@@ -6,6 +6,6 @@
 #include "dtc.h"
 
 struct chip_operations mainboard_emulation_qemu_i386_ops = {
-	CHIP_NAME("qemu mainboard ")
+	"qemu mainboard "
 };