From bbc8b628b07e191624a74ce99fe36681cd70af37 Mon Sep 17 00:00:00 2001
From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 15:10:38 +1100
Subject: [PATCH] merge filename and modify references to iSeries/mf.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>
---
 arch/powerpc/platforms/iseries/mf.c                     | 2 +-
 arch/powerpc/platforms/iseries/pci.c                    | 2 +-
 arch/powerpc/platforms/iseries/setup.c                  | 2 +-
 arch/powerpc/platforms/iseries/viopath.c                | 2 +-
 drivers/net/iseries_veth.c                              | 2 +-
 include/{asm-ppc64/iSeries => asm-powerpc/iseries}/mf.h | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/{asm-ppc64/iSeries => asm-powerpc/iseries}/mf.h (100%)

diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 689f65a49c..59916393dd 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -39,7 +39,7 @@
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
 #include <asm/iSeries/vio.h>
-#include <asm/iSeries/mf.h>
+#include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/it_lp_queue.h>
 
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index a39b7a7201..7d7d588434 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -37,7 +37,7 @@
 #include <asm/abs_addr.h>
 
 #include <asm/iseries/hv_call_xm.h>
-#include <asm/iSeries/mf.h>
+#include <asm/iseries/mf.h>
 
 #include <asm/ppc-pci.h>
 
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 758f5b5062..d955e950a7 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -49,7 +49,7 @@
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iseries/it_lp_queue.h>
-#include <asm/iSeries/mf.h>
+#include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/lpar_map.h>
 
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 6fa39ae5f1..72dfcb6d4d 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -45,7 +45,7 @@
 #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>
+#include <asm/iseries/mf.h>
 #include <asm/iSeries/vio.h>
 
 /* Status of the path to each other partition in the system.
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 1070140d9f..d86d8f055a 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -72,7 +72,7 @@
 #include <linux/ethtool.h>
 
 #include <asm/abs_addr.h>
-#include <asm/iSeries/mf.h>
+#include <asm/iseries/mf.h>
 #include <asm/uaccess.h>
 
 #include <asm/iseries/hv_lp_config.h>
diff --git a/include/asm-ppc64/iSeries/mf.h b/include/asm-powerpc/iseries/mf.h
similarity index 100%
rename from include/asm-ppc64/iSeries/mf.h
rename to include/asm-powerpc/iseries/mf.h
-- 
2.39.5