summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/iseries/lpardata.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 08:15:43 +0100
committerStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 08:15:43 +0100
commit2be7a906752abf8dce9350c23b6d1036049a5d3e (patch)
treeef178fa5801bdce24938819086662bb747d8c0c2 /arch/powerpc/platforms/iseries/lpardata.c
parentMerge iSeries include file move (diff)
parentpowerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.c (diff)
downloadlinux-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.xz
linux-2be7a906752abf8dce9350c23b6d1036049a5d3e.zip
Merge Paulus' tree
Diffstat (limited to 'arch/powerpc/platforms/iseries/lpardata.c')
-rw-r--r--arch/powerpc/platforms/iseries/lpardata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index 608431a22607..bb8c91537f35 100644
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -13,7 +13,6 @@
#include <linux/bitops.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
-#include <asm/naca.h>
#include <asm/abs_addr.h>
#include <asm/iseries/it_lp_naca.h>
#include <asm/lppaca.h>
@@ -23,6 +22,7 @@
#include <asm/iseries/it_exp_vpd_panel.h>
#include <asm/iseries/it_lp_queue.h>
+#include "naca.h"
#include "vpd_areas.h"
#include "spcomm_area.h"
#include "ipl_parms.h"