diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b0285abcd5..2973d6834c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -64,7 +64,6 @@ config CPU_VIA_C7
 	  arch/x86/Makefile for more hints on possible values.
 	  It is usually set in mainboard/*/Kconfig.
 
-
 config CONFIG_HPET
 	boolean
 	depends CPU_AMD_K8
diff --git a/arch/x86/i586/stage0.S b/arch/x86/i586/stage0.S
index 5679dd366a..6b89749810 100644
--- a/arch/x86/i586/stage0.S
+++ b/arch/x86/i586/stage0.S
@@ -69,21 +69,15 @@ __protected_stage0:
 
 .align 4
 
-
-
-/* We will use 4Kbytes only for cache as ram. This is
- * enough to fit in our stack.
- *
- * disable HyperThreading is done by eswar
+/* disable HyperThreading is done by eswar
  * the other is very similar to the AMD CAR, except remove amd specific msr
  */
 
 #define CacheSize CONFIG_CARSIZE
-
 #define CacheBase CONFIG_CARBASE
 
 #define ASSEMBLY
-#include "mtrr.h"
+#include <mtrr.h>
 
 	/* Save the BIST result */
 	movl    %eax, %ebp
@@ -175,6 +169,7 @@ NotHtProcessor:
 	/* Clear all MTRRs */
 	xorl	%edx, %edx
 	movl	$fixed_mtrr_msr, %esi
+
 clear_fixed_var_mtrr:
 	lodsl	(%esi), %eax
 	testl	%eax, %eax
@@ -331,8 +326,7 @@ clear_fixed_var_mtrr_out:
 
 lout:
 	/* Store zero for the pointer to the global variables. */
-	movl    $0, %eax
-	pushl   %eax
+	pushl   $0
 
 	/* Restore the BIST result. */
 	movl	%ebp, %eax
diff --git a/arch/x86/via/stage0.S b/arch/x86/via/stage0.S
index 41e0017256..9a30dfce3e 100644
--- a/arch/x86/via/stage0.S
+++ b/arch/x86/via/stage0.S
@@ -1,6 +1,6 @@
-/* 
+/*
  * This file is part of the coreboot project.
- * 
+ *
  * Copyright (C) 2000,2007 Ronald G. Minnich <rminnich@gmail.com>
  * Copyright (C) 2005 Eswar Nallusamy, LANL
  * Copyright (C) 2005 Tyan
@@ -10,16 +10,16 @@
  * Copyright (C) 2007,2008 Carl-Daniel Hailfinger
  * Copyright (C) 2008 VIA Technologies, Inc.
  * (Written by Jason Zhao <jasonzhao@viatech.com.cn> for VIA)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA