diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 330cd783206fb7034dea7c993a3fc8aea0b5376f..bc5a3689cc05192c8a8129e72d735e1d50eb7558 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -40,7 +40,7 @@
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/lppaca.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/cache.h>
 #include <asm/systemcfg.h>
 #include <asm/compat.h>
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index b1aacf64fb8ebdfeea8a8ea8356833bf931d344f..55ecc8d3e73fb956df4f78502db27e1ab028a81f 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -37,7 +37,7 @@
 
 #include <asm/ppcdebug.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_xm.h>
 
 #include "irq.h"
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 96aa0dd72fb018fc6c0617ebfb1a0c7a16550ab1..39ee881c36c3f9507660d21a132ef7e11cad7ed8 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -18,7 +18,7 @@
 #include <asm/system.h>
 #include <asm/paca.h>
 #include <asm/iSeries/ItLpQueue.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iSeries/ItLpNaca.h>
 
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 638747c772f84217697b246231ff955b524b1ab5..881d81fcf3b8b3f4c5ccd89f476ca9567604d585 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -50,7 +50,7 @@
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iSeries/ItLpQueue.h>
 #include <asm/iSeries/mf.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/LparMap.h>
 
 #include "setup.h"
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 8e33a90bedb97f335a01604098ad2eaef33ab881..7b1a9daae206bf2a04152a0031d4bd0c54755610 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -43,7 +43,7 @@
 #include <asm/uaccess.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/ItExtVpdPanel.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iSeries/vio.h>
diff --git a/arch/ppc64/kernel/asm-offsets.c b/arch/ppc64/kernel/asm-offsets.c
index 5e6046cb414e0da876d9359333ff5f507134340f..504dee836d292716693950494a3576636ed566b3 100644
--- a/arch/ppc64/kernel/asm-offsets.c
+++ b/arch/ppc64/kernel/asm-offsets.c
@@ -31,7 +31,7 @@
 
 #include <asm/paca.h>
 #include <asm/lppaca.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/rtas.h>
 #include <asm/cputable.h>
 #include <asm/cache.h>
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 5c907b747648e112e54b387fb83cb1f5bca8623d..3af1885a8200fe650330cd1f8b46dab1b84b85b3 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -46,7 +46,7 @@
 #include <asm/uaccess.h>
 #include <asm/vio.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/vio.h>
 
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 36f31d202223b759cf8403d6d2a97388a58ef833..da78729413f46f85d8dc40ffa24fc2cac01bb79b 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -47,7 +47,7 @@
 #include <asm/vio.h>
 #include <asm/scatterlist.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/vio.h>
 
 #define VIOCD_DEVICE			"iseries/vcd"
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 33d7820eaab9d552601b618c18a8d8ac2ba606fd..694bab3b7bf702896c49fedd9ef686b3b7ac21dd 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -46,7 +46,7 @@
 
 #include <asm/iSeries/vio.h>
 
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call.h>
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 296797e5a2b517a187c9a15c176fa5058069a0d7..3242b241d78956fb158a282d3821289e68026565 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -55,7 +55,7 @@
 
 #include <asm/vio.h>
 #include <asm/iSeries/vio.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
 
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index aaabaf30d4b8afe72d4f6cff4cd325fdacdc62e7..57ba1a11e405326f4086bb281052ec769b214023 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -77,7 +77,7 @@
 
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iommu.h>
 #include <asm/vio.h>
 
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index c652779c1a323adf4632225775ac02671e1d2f8d..78397d855d34eabcd0855c9a3704ce4ba8ab2dfd 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -29,7 +29,7 @@
  */
 
 #include <asm/iSeries/vio.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/vio.h>
diff --git a/include/asm-ppc64/iSeries/HvLpEvent.h b/include/asm-powerpc/iseries/hv_lp_event.h
similarity index 100%
rename from include/asm-ppc64/iSeries/HvLpEvent.h
rename to include/asm-powerpc/iseries/hv_lp_event.h
diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-ppc64/iSeries/vio.h
index 6c05e6257f53a386f99fbe2b744cb50b64468efc..4d39ce6c687a50ff5c0c1cc4b38e9cdb2c5069ac 100644
--- a/include/asm-ppc64/iSeries/vio.h
+++ b/include/asm-ppc64/iSeries/vio.h
@@ -42,7 +42,7 @@
 #define _ISERIES_VIO_H
 
 #include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 
 /*
  * iSeries virtual I/O events use the subtype field in