From c2c08fe0ffe5822af662dfcc7f76868fb7522007 Mon Sep 17 00:00:00 2001
From: Jochen Friedrich <jochen@scram.de>
Date: Tue, 28 Aug 2007 13:20:48 +0200
Subject: [PATCH] --- yaml --- r: 64906 b: refs/heads/master c:
 36c50f729b77144cae8d43457fefca66a4eeff6a h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ppc/kernel/head_8xx.S | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12f138224c51..6fac982e32ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2af8569dc9f29c303bf4aa012d991afcfaeed0c3
+refs/heads/master: 36c50f729b77144cae8d43457fefca66a4eeff6a
diff --git a/trunk/arch/ppc/kernel/head_8xx.S b/trunk/arch/ppc/kernel/head_8xx.S
index 944c35c24278..eb8d26f87362 100644
--- a/trunk/arch/ppc/kernel/head_8xx.S
+++ b/trunk/arch/ppc/kernel/head_8xx.S
@@ -495,9 +495,7 @@ LoadLargeDTLB:
 	lwz	r11, 4(r0)
 
 	lwz	r12, 16(r0)
-#ifdef CONFIG_8xx_CPU6
 	lwz	r3, 8(r0)
-#endif
 	rfi
 
 /* This is the data TLB error on the MPC8xx.  This could be due to