merge filename and modify references to iSeries/mf.h

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

diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 689f65a49c00744fdf19f053923288ecca50d70b..59916393ddeb360b843d9289cecae399caaf7937 100644 (file)
--- 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 a39b7a720101ee5d1dd099bb9687e3bbe54e7a92..7d7d5884343fa4a77a355601420a4cd681cf7aa2 100644 (file)
--- 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 758f5b50628a2aa811e07a1f5143f9899254c7c5..d955e950a74c269bfa2cee0d27cf35b2757d097b 100644 (file)
--- 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 6fa39ae5f12cfe1287d083011461488aa291d30e..72dfcb6d4dda9ebe67e3cb6911f05aff9a5a283d 100644 (file)
--- 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 1070140d9f5968dd8a57fce541c7df099ec63ef7..d86d8f055a6cd7d12330237baec71550230e4609 100644 (file)
--- 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