From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Nov 2005 07:15:43 +0000 (+1100)
Subject: Merge Paulus' tree
X-Git-Tag: v2.6.15-rc1~726^2~3^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be7a906752abf8dce9350c23b6d1036049a5d3e;p=linux-2.6

Merge Paulus' tree
---

2be7a906752abf8dce9350c23b6d1036049a5d3e
diff --cc arch/powerpc/platforms/iseries/lpardata.c
index 608431a226,e856947bd1..bb8c91537f
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@@ -13,16 -13,16 +13,16 @@@
  #include <linux/bitops.h>
  #include <asm/processor.h>
  #include <asm/ptrace.h>
- #include <asm/naca.h>
  #include <asm/abs_addr.h>
 -#include <asm/iSeries/ItLpNaca.h>
 +#include <asm/iseries/it_lp_naca.h>
  #include <asm/lppaca.h>
 -#include <asm/iSeries/ItLpRegSave.h>
 +#include <asm/iseries/it_lp_reg_save.h>
  #include <asm/paca.h>
 -#include <asm/iSeries/LparMap.h>
 -#include <asm/iSeries/ItExtVpdPanel.h>
 -#include <asm/iSeries/ItLpQueue.h>
 +#include <asm/iseries/lpar_map.h>
 +#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"
diff --cc arch/powerpc/platforms/iseries/setup.c
index 8e5ef62715,7bc19a594c..fda712b421
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@@ -46,14 -45,15 +45,15 @@@
  #include <asm/cache.h>
  #include <asm/sections.h>
  #include <asm/abs_addr.h>
 -#include <asm/iSeries/HvLpConfig.h>
 -#include <asm/iSeries/HvCallEvent.h>
 -#include <asm/iSeries/HvCallXm.h>
 -#include <asm/iSeries/ItLpQueue.h>
 -#include <asm/iSeries/mf.h>
 -#include <asm/iSeries/HvLpEvent.h>
 -#include <asm/iSeries/LparMap.h>
 +#include <asm/iseries/hv_lp_config.h>
 +#include <asm/iseries/hv_call_event.h>
 +#include <asm/iseries/hv_call_xm.h>
 +#include <asm/iseries/it_lp_queue.h>
 +#include <asm/iseries/mf.h>
 +#include <asm/iseries/hv_lp_event.h>
 +#include <asm/iseries/lpar_map.h>
  
+ #include "naca.h"
  #include "setup.h"
  #include "irq.h"
  #include "vpd_areas.h"