From 11f6068235f93ee7f12e0923f428925baba3e79e Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Mon, 20 Aug 2007 07:29:36 -0500
Subject: [PATCH] --- yaml --- r: 67238 b: refs/heads/master c:
 1daa194a87b3ea77760b4b5361eb47900dfc00a9 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/head_40x.S  | 1 -
 trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6ed29c8c45e3..0ba21a7ec568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aab69292e4efd38181cd300d9b83b12592643d6c
+refs/heads/master: 1daa194a87b3ea77760b4b5361eb47900dfc00a9
diff --git a/trunk/arch/powerpc/kernel/head_40x.S b/trunk/arch/powerpc/kernel/head_40x.S
index fe8afb60290e..a8e045773a92 100644
--- a/trunk/arch/powerpc/kernel/head_40x.S
+++ b/trunk/arch/powerpc/kernel/head_40x.S
@@ -35,7 +35,6 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/ibm4xx.h>
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
diff --git a/trunk/arch/powerpc/kernel/ppc_ksyms.c b/trunk/arch/powerpc/kernel/ppc_ksyms.c
index a20f1951a5ce..430c502179c3 100644
--- a/trunk/arch/powerpc/kernel/ppc_ksyms.c
+++ b/trunk/arch/powerpc/kernel/ppc_ksyms.c
@@ -180,7 +180,7 @@ EXPORT_SYMBOL(cacheable_memcpy);
 EXPORT_SYMBOL(cpm_install_handler);
 EXPORT_SYMBOL(cpm_free_handler);
 #endif /* CONFIG_8xx */
-#if defined(CONFIG_8xx) || defined(CONFIG_40x)
+#if defined(CONFIG_8xx)
 EXPORT_SYMBOL(__res);
 #endif