merge filename and modify references to iseries/it_exp_vpd_panel.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>

diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index ed2ffee6f731ccd2271bd1f3fea26ebe7238487d..9c8c212521428d97132af9c0bed1823749f1aa68 100644 (file)
--- 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 17bf4e70d5cc491ceed59d3842fd864e2193fc1a..6fa39ae5f12cfe1287d083011461488aa291d30e 100644 (file)
--- 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 e4236f2707e146467d72e9c499d0b2fee3f21908..e86155770bbc5ff761352dfc556b7c146295e77d 100644 (file)
--- 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-powerpc/iseries/it_exp_vpd_panel.h b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
new file mode 100644 (file)
index 0000000..4c546a8
--- /dev/null
+++ b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
@@ -0,0 +1,52 @@
+/*
+ * ItExtVpdPanel.h
+ * Copyright (C) 2002  Dave Boutcher IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#ifndef _ITEXTVPDPANEL_H
+#define _ITEXTVPDPANEL_H
+
+/*
+ *     This struct maps the panel information
+ *
+ * Warning:
+ *     This data must match the architecture for the panel information
+ */
+
+#include <asm/types.h>
+
+struct ItExtVpdPanel {
+       /* Definition of the Extended Vpd On Panel Data Area */
+       char    systemSerial[8];
+       char    mfgID[4];
+       char    reserved1[24];
+       char    machineType[4];
+       char    systemID[6];
+       char    somUniqueCnt[4];
+       char    serialNumberCount;
+       char    reserved2[7];
+       u16     bbu3;
+       u16     bbu2;
+       u16     bbu1;
+       char    xLocationLabel[8];
+       u8      xRsvd1[6];
+       u16     xFrameId;
+       u8      xRsvd2[48];
+};
+
+extern struct ItExtVpdPanel    xItExtVpdPanel;
+
+#endif /* _ITEXTVPDPANEL_H */

diff --git a/include/asm-ppc64/iSeries/ItExtVpdPanel.h b/include/asm-ppc64/iSeries/ItExtVpdPanel.h
deleted file mode 100644 (file)
index 4c546a8..0000000
--- a/include/asm-ppc64/iSeries/ItExtVpdPanel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * ItExtVpdPanel.h
- * Copyright (C) 2002  Dave Boutcher IBM Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#ifndef _ITEXTVPDPANEL_H
-#define _ITEXTVPDPANEL_H
-
-/*
- *     This struct maps the panel information
- *
- * Warning:
- *     This data must match the architecture for the panel information
- */
-
-#include <asm/types.h>
-
-struct ItExtVpdPanel {
-       /* Definition of the Extended Vpd On Panel Data Area */
-       char    systemSerial[8];
-       char    mfgID[4];
-       char    reserved1[24];
-       char    machineType[4];
-       char    systemID[6];
-       char    somUniqueCnt[4];
-       char    serialNumberCount;
-       char    reserved2[7];
-       u16     bbu3;
-       u16     bbu2;
-       u16     bbu1;
-       char    xLocationLabel[8];
-       u8      xRsvd1[6];
-       u16     xFrameId;
-       u8      xRsvd2[48];
-};
-
-extern struct ItExtVpdPanel    xItExtVpdPanel;
-
-#endif /* _ITEXTVPDPANEL_H */