summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly Daly <kelly@au.ibm.com>2005-11-02 02:48:25 (GMT)
committerKelly Daly <kelly@au.ibm.com>2005-11-02 02:48:25 (GMT)
commit7b487bb801b4bd790aa4bf7c157889f9d05e239c (patch)
tree0ebea34878e1af7b0d465e43d1d3ea48e69b6c3a
parent1ec65d76f3e5d4863b4bf93dfd2bff37f8bf4374 (diff)
downloadlinux-7b487bb801b4bd790aa4bf7c157889f9d05e239c.tar.xz
merge filename and modify references to iseries/it_exp_vpd_panel.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
-rw-r--r--arch/powerpc/platforms/iseries/lpardata.c2
-rw-r--r--arch/powerpc/platforms/iseries/viopath.c2
-rw-r--r--arch/ppc64/kernel/lparcfg.c2
-rw-r--r--include/asm-powerpc/iseries/it_exp_vpd_panel.h (renamed from include/asm-ppc64/iSeries/ItExtVpdPanel.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index ed2ffee..9c8c212 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 17bf4e7..6fa39ae 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 e4236f2..e861557 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
index 4c546a8..4c546a8 100644
--- a/include/asm-ppc64/iSeries/ItExtVpdPanel.h
+++ b/include/asm-powerpc/iseries/it_exp_vpd_panel.h