summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/iSeries_smp.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
commit3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch)
treeceba46966a5a1112a05d257d8ecb25ae5eee95e0 /arch/ppc64/kernel/iSeries_smp.c
parent364f6c717deef4a3ac4982e670fa9846b43cd060 (diff)
parentee98689be1b054897ff17655008c3048fe88be94 (diff)
downloadop-kernel-dev-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.zip
op-kernel-dev-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/ppc64/kernel/iSeries_smp.c')
-rw-r--r--arch/ppc64/kernel/iSeries_smp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/iSeries_smp.c b/arch/ppc64/kernel/iSeries_smp.c
index ba1f084..f74386e 100644
--- a/arch/ppc64/kernel/iSeries_smp.c
+++ b/arch/ppc64/kernel/iSeries_smp.c
@@ -38,9 +38,7 @@
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/paca.h>
-#include <asm/iSeries/LparData.h>
#include <asm/iSeries/HvCall.h>
-#include <asm/iSeries/HvCallCfg.h>
#include <asm/time.h>
#include <asm/ppcdebug.h>
#include <asm/machdep.h>
OpenPOWER on IntegriCloud