merge filename and modify references to iseries/hv_call_event.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 54c7753..96aa0dd 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -19,7 +19,7 @@
#include <asm/paca.h>
#include <asm/iSeries/ItLpQueue.h>
#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallEvent.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 1544c6f..2c667b1 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -46,7 +46,7 @@
#include <asm/sections.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/HvLpConfig.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvCallXm.h>
#include <asm/iSeries/ItLpQueue.h>
#include <asm/iSeries/mf.h>
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 180507ae..ecf5c09 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -47,7 +47,7 @@
#include <asm/iSeries/vio.h>
#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvLpConfig.h>
#include <asm/iseries/hv_call.h>
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 51abd3d..232da8c 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -56,7 +56,7 @@
#include <asm/vio.h>
#include <asm/iSeries/vio.h>
#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvLpConfig.h>
#define VIOTAPE_VERSION "1.2"
diff --git a/include/asm-ppc64/iSeries/HvCallEvent.h b/include/asm-powerpc/iseries/hv_call_event.h
similarity index 100%
rename from include/asm-ppc64/iSeries/HvCallEvent.h
rename to include/asm-powerpc/iseries/hv_call_event.h
diff --git a/include/asm-ppc64/iSeries/HvLpEvent.h b/include/asm-ppc64/iSeries/HvLpEvent.h
index 865000d..75ff1b3 100644
--- a/include/asm-ppc64/iSeries/HvLpEvent.h
+++ b/include/asm-ppc64/iSeries/HvLpEvent.h
@@ -25,7 +25,7 @@
#include <asm/types.h>
#include <asm/ptrace.h>
#include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iseries/hv_call_event.h>
/*
* HvLpEvent is the structure for Lp Event messages passed between
diff --git a/include/asm-ppc64/iSeries/mf.h b/include/asm-ppc64/iSeries/mf.h
index 7e6a0d9..f84404a 100644
--- a/include/asm-ppc64/iSeries/mf.h
+++ b/include/asm-ppc64/iSeries/mf.h
@@ -29,7 +29,7 @@
#include <linux/types.h>
#include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvCallEvent.h>
+#include <asm/iSeries/iseries/hv_call_event.h>
struct rtc_time;