From 325c21e6b85376cba8844bb5f0f2c831ec0d0feb Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 8 Dec 2009 17:49:21 +0100
Subject: [PATCH] --- yaml --- r: 176142 b: refs/heads/master c:
 5de23446300a4b2170efd048ae2ec65022650650 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/microblaze/kernel/setup.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c1870f74686c..7a3c20add4e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11d5136043424ec6980293210ae774d3ab9646b2
+refs/heads/master: 5de23446300a4b2170efd048ae2ec65022650650
diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
index acd70fe30a71..1c3f18ba8af1 100644
--- a/trunk/arch/microblaze/kernel/setup.c
+++ b/trunk/arch/microblaze/kernel/setup.c
@@ -58,8 +58,6 @@ void __init setup_arch(char **cmdline_p)
 	__invalidate_dcache_all();
 	__enable_dcache();
 
-	panic_timeout = 120;
-
 	setup_memory();
 
 #if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER)