diff --git a/arch/powerpc/platforms/iseries/hvlpconfig.c b/arch/powerpc/platforms/iseries/hvlpconfig.c
index dc28621aea0d908c634f24b586d54828fcc92d8e..663a1affb4bbcbc569a5aa88018edccbb2b6ff43 100644
--- a/arch/powerpc/platforms/iseries/hvlpconfig.c
+++ b/arch/powerpc/platforms/iseries/hvlpconfig.c
@@ -17,7 +17,7 @@
  */
 
 #include <linux/module.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 
 HvLpIndex HvLpConfig_getLpIndex_outline(void)
 {
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index e5de31aa00157b1323765f19a8624dd465857e8d..027df204446db4ff6c333f2eaa40201aa29d7264 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -40,7 +40,7 @@
 #include <asm/abs_addr.h>
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/mf.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/ItLpQueue.h>
 
 #include "setup.h"
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 669e63174ecc09750370012bfd790825fb267b95..638747c772f84217697b246231ff955b524b1ab5 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -45,7 +45,7 @@
 #include <asm/cache.h>
 #include <asm/sections.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/HvLpConfig.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/ItLpQueue.h>
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index c64741e50cb2b1e43974d8bb30ea61ae3c9b1605..4e2dafc83bb2575b875678591bd4e369d4f53346 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -19,7 +19,7 @@
 #include <asm/page.h>
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_xm.h>
 
 struct device *iSeries_vio_dev = &vio_bus_device.dev;
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index c0c767bd37f1156b99b85ffcb74e4085320bbbe1..8e33a90bedb97f335a01604098ad2eaef33ab881 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -44,7 +44,7 @@
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/ItExtVpdPanel.h>
 #include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iSeries/vio.h>
 
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index cae19bbd5acd9d790ef84945b678872ffd1c2593..e4236f2707e146467d72e9c499d0b2fee3f21908 100644
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -26,7 +26,7 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/lppaca.h>
 #include <asm/hvcall.h>
 #include <asm/firmware.h>
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 709f809f79f1f9cc4b3e09cb9ce3e8b71b913f32..5c907b747648e112e54b387fb83cb1f5bca8623d 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -47,7 +47,7 @@
 #include <asm/vio.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/vio.h>
 
 MODULE_DESCRIPTION("iSeries Virtual DASD");
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index ecf5c0953ae43d6ed0203ce4b4164f6a3a85ac9f..33d7820eaab9d552601b618c18a8d8ac2ba606fd 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -48,7 +48,7 @@
 
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iseries/hv_call_event.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call.h>
 
 #ifdef CONFIG_VT
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 232da8c5e66aff5168fd3f37d91465caf1251842..296797e5a2b517a187c9a15c176fa5058069a0d7 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -57,7 +57,7 @@
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iseries/hv_call_event.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 
 #define VIOTAPE_VERSION		"1.2"
 #define VIOTAPE_MAXREQ		1
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index f5ea39ff1017cffc9a21e5059d9c4aa8238fa88d..aaabaf30d4b8afe72d4f6cff4cd325fdacdc62e7 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -75,7 +75,7 @@
 #include <asm/iSeries/mf.h>
 #include <asm/uaccess.h>
 
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iommu.h>
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index e9202f2a8276e27ba2dbd964d705ee732b758209..c652779c1a323adf4632225775ac02671e1d2f8d 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -31,7 +31,7 @@
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iseries/hv_lp_config.h>
 #include <asm/vio.h>
 #include <linux/device.h>
 #include "ibmvscsi.h"
diff --git a/include/asm-ppc64/iSeries/HvLpConfig.h b/include/asm-powerpc/iseries/hv_lp_config.h
similarity index 100%
rename from include/asm-ppc64/iSeries/HvLpConfig.h
rename to include/asm-powerpc/iseries/hv_lp_config.h