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

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 arch/powerpc/platforms/iseries/lpardata.c                       | 2 +-
 arch/powerpc/platforms/iseries/viopath.c                        | 2 +-
 arch/ppc64/kernel/lparcfg.c                                     | 2 +-
 .../ItExtVpdPanel.h => asm-powerpc/iseries/it_exp_vpd_panel.h}  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{asm-ppc64/iSeries/ItExtVpdPanel.h => asm-powerpc/iseries/it_exp_vpd_panel.h} (100%)

diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index ed2ffee6f731..9c8c21252142 100644
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -20,7 +20,7 @@
 #include <asm/iSeries/ItLpRegSave.h>
 #include <asm/paca.h>
 #include <asm/iSeries/LparMap.h>
-#include <asm/iSeries/ItExtVpdPanel.h>
+#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/iSeries/ItLpQueue.h>
 
 #include "vpd_areas.h"
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 17bf4e70d5cc..6fa39ae5f12c 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -42,7 +42,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iSeries/ItExtVpdPanel.h>
+#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/mf.h>
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index e4236f2707e1..e86155770bbc 100644
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -33,7 +33,7 @@
 #include <asm/rtas.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/iSeries/ItExtVpdPanel.h>
+#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/prom.h>
 
 #define MODULE_VERS "1.6"
diff --git a/include/asm-ppc64/iSeries/ItExtVpdPanel.h b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
similarity index 100%
rename from include/asm-ppc64/iSeries/ItExtVpdPanel.h
rename to include/asm-powerpc/iseries/it_exp_vpd_panel.h
-- 
GitLab