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 54c7753dbe0592d39c38cf0ba5fd4bb3b2be80e9..96aa0dd72fb018fc6c0617ebfb1a0c7a16550ab1 100644 (file)
--- 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 1544c6f10a384a27ce4c02d4b5f4fb8cb22cee12..2c667b180b1e0183e0956d6b0cb6da2a4a77480a 100644 (file)
--- 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 180507ae590f21809b803ce4144c43e16df5029f..ecf5c0953ae43d6ed0203ce4b4164f6a3a85ac9f 100644 (file)
--- 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 51abd3defc1c32d00e0217896f6ed64eccd74701..232da8c5e66aff5168fd3f37d91465caf1251842 100644 (file)
--- 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 865000de79b6fa3b4f56f39236297cc26dae6e44..75ff1b3ed2e5647413a84a47c8c242b2db70ae9b 100644 (file)
--- 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 7e6a0d936999c86cb5d9c835a08ba77e1ae6f687..f84404a07f4b35b60c5fad734a807c0a559af96b 100644 (file)
--- 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;