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

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 arch/powerpc/kernel/time.c                                      | 2 +-
 arch/powerpc/platforms/iseries/lpardata.c                       | 2 +-
 arch/powerpc/platforms/iseries/lpevents.c                       | 2 +-
 arch/powerpc/platforms/iseries/mf.c                             | 2 +-
 arch/powerpc/platforms/iseries/proc.c                           | 2 +-
 arch/powerpc/platforms/iseries/setup.c                          | 2 +-
 arch/ppc64/kernel/irq.c                                         | 2 +-
 arch/ppc64/kernel/pacaData.c                                    | 2 +-
 .../iSeries/ItLpQueue.h => asm-powerpc/iseries/it_lp_queue.h}   | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename include/{asm-ppc64/iSeries/ItLpQueue.h => asm-powerpc/iseries/it_lp_queue.h} (100%)

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 348746c55e..6996a593dc 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -66,7 +66,7 @@
 #include <asm/firmware.h>
 #endif
 #ifdef CONFIG_PPC_ISERIES
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 #endif
 
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index d0937613e7..dfe38eb403 100644
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -21,7 +21,7 @@
 #include <asm/paca.h>
 #include <asm/iSeries/LparMap.h>
 #include <asm/iseries/it_exp_vpd_panel.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 
 #include "vpd_areas.h"
 #include "spcomm_area.h"
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index f0040d469a..e9fb98bf89 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -17,7 +17,7 @@
 
 #include <asm/system.h>
 #include <asm/paca.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/it_lp_naca.h>
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 027df20444..689f65a49c 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -41,7 +41,7 @@
 #include <asm/iSeries/vio.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 
 #include "setup.h"
 
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index beba0f62e6..e68b6b5fa8 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -24,7 +24,7 @@
 #include <asm/processor.h>
 #include <asm/time.h>
 #include <asm/lppaca.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 
 #include "processor_vpd.h"
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 881d81fcf3..9a9e54b736 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -48,7 +48,7 @@
 #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>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/LparMap.h>
diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c
index f41afe5450..310931dbd4 100644
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -52,7 +52,7 @@
 #include <asm/cache.h>
 #include <asm/prom.h>
 #include <asm/ptrace.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/machdep.h>
 #include <asm/paca.h>
 
diff --git a/arch/ppc64/kernel/pacaData.c b/arch/ppc64/kernel/pacaData.c
index 33a2d8db3f..5e27e5a6a3 100644
--- a/arch/ppc64/kernel/pacaData.c
+++ b/arch/ppc64/kernel/pacaData.c
@@ -17,7 +17,7 @@
 #include <asm/page.h>
 
 #include <asm/lppaca.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/paca.h>
 
 static union {
diff --git a/include/asm-ppc64/iSeries/ItLpQueue.h b/include/asm-powerpc/iseries/it_lp_queue.h
similarity index 100%
rename from include/asm-ppc64/iSeries/ItLpQueue.h
rename to include/asm-powerpc/iseries/it_lp_queue.h
-- 
2.39.5