summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_64.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-07-14 17:27:26 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2006-07-14 17:27:26 +1000
commit790e05d8c2b9941218c7c9ffb5c318382fab0a8b (patch)
treeefc88203419278fbe9aa6ebbf3b74738abf573f2 /arch/powerpc/kernel/setup_64.c
parent20697cb775bdd0271f3c90fad2d15c065fd19488 (diff)
parentca652c9396fa052815518e2b2ce2ebee6d9fb861 (diff)
Merge branch 'mpe'
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r--arch/powerpc/kernel/setup_64.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index fd1785e4c9b..e2447aef3a8 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -56,7 +56,6 @@
#include <asm/page.h>
#include <asm/mmu.h>
#include <asm/lmb.h>
-#include <asm/iseries/it_lp_naca.h>
#include <asm/firmware.h>
#include <asm/xmon.h>
#include <asm/udbg.h>