From 3fc4e990dc6455d48e7feb5bbb013805a3bd2693 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Fri, 23 Feb 2007 13:59:27 +0000
Subject: [PATCH] fix double checkin conflict

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>




git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@105 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 arch/x86/cachemain.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c
index e2597b627c..7a69cfc720 100644
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@@ -72,8 +72,6 @@ void stage1_main(u32 bist)
 		}
 	};
 
-        struct mem_file result;
-
 	post_code(0x02);
 
 	// before we do anything, we want to stop if we dont run