From c0a8d05c8a5db835b20a3465b1be1cfe4752a13c Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 11:11:11 +1100
Subject: [PATCH] merge filename and modify references to
 iseries/hv_call_event.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 arch/powerpc/platforms/iseries/lpevents.c                       | 2 +-
 arch/powerpc/platforms/iseries/setup.c                          | 2 +-
 drivers/char/viocons.c                                          | 2 +-
 drivers/char/viotape.c                                          | 2 +-
 .../HvCallEvent.h => asm-powerpc/iseries/hv_call_event.h}       | 0
 include/asm-ppc64/iSeries/HvLpEvent.h                           | 2 +-
 include/asm-ppc64/iSeries/mf.h                                  | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename include/{asm-ppc64/iSeries/HvCallEvent.h => asm-powerpc/iseries/hv_call_event.h} (100%)

diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 54c7753dbe..96aa0dd72f 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 1544c6f10a..2c667b180b 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 180507ae59..ecf5c0953a 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 51abd3defc..232da8c5e6 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 865000de79..75ff1b3ed2 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 7e6a0d9369..f84404a07f 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;
 
-- 
2.39.5