summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/ras.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 00:06:06 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 00:06:06 +0200
commitaef7b83c92dd0b7e994805440655d1d64147287b (patch)
tree981f373358c1988e061625e8f272013065cb086f /arch/ppc64/kernel/ras.c
parent[netdrvr] Fix register_netdev() races in older ISA net drivers (diff)
parentMerge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz
linux-aef7b83c92dd0b7e994805440655d1d64147287b.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc64/kernel/ras.c')
-rw-r--r--arch/ppc64/kernel/ras.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c
index 1c4c796b212b..3c00f7bfc1b5 100644
--- a/arch/ppc64/kernel/ras.c
+++ b/arch/ppc64/kernel/ras.c
@@ -47,7 +47,6 @@
#include <asm/cache.h>
#include <asm/prom.h>
#include <asm/ptrace.h>
-#include <asm/iSeries/LparData.h>
#include <asm/machdep.h>
#include <asm/rtas.h>
#include <asm/ppcdebug.h>