From: Kelly Daly <kelly@au.ibm.com>
Date: Wed, 2 Nov 2005 04:13:57 +0000 (+1100)
Subject: merge filename and modify references to iseries/vio.h
X-Git-Tag: v2.6.15-rc1~726^2~3^2~18^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b420677870e53b9b76ced91da207431f687eaed1;p=linux-2.6

merge filename and modify references to iseries/vio.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 59916393dd..49e7e4b858 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -38,7 +38,7 @@
 #include <asm/uaccess.h>
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.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/vio.c b/arch/powerpc/platforms/iseries/vio.c
index d607ebaef2..c27a66876c 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -17,7 +17,7 @@
 #include <asm/tce.h>
 #include <asm/abs_addr.h>
 #include <asm/page.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_xm.h>
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 72dfcb6d4d..fe97bfbf74 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -46,7 +46,7 @@
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/mf.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 
 /* Status of the path to each other partition in the system.
  * This is overkill, since we will only ever establish connections
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 436f169baf..2d518aa272 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -48,7 +48,7 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 
 MODULE_DESCRIPTION("iSeries Virtual DASD");
 MODULE_AUTHOR("Dave Boutcher");
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index cb87d270b6..b5191780ec 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -48,7 +48,7 @@
 #include <asm/scatterlist.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 
 #define VIOCD_DEVICE			"iseries/vcd"
 #define VIOCD_DEVICE_DEVFS		"iseries/vcd"
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 694bab3b7b..98601c7d04 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -44,7 +44,7 @@
 #include <linux/tty_flip.h>
 #include <linux/sysrq.h>
 
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 3242b241d7..867cc4e418 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -29,7 +29,7 @@
  *
  * All tape operations are performed by sending messages back and forth to
  * the OS/400 partition.  The format of the messages is defined in
- * iSeries/vio.h
+ * iseries/vio.h
  */
 #include <linux/config.h>
 #include <linux/version.h>
@@ -54,7 +54,7 @@
 #include <asm/ioctls.h>
 
 #include <asm/vio.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index ed89659ac3..1045872b01 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -28,7 +28,7 @@
  * hypervisor system or a converged hypervisor system.
  */
 
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_config.h>
diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-powerpc/iseries/vio.h
similarity index 100%
rename from include/asm-ppc64/iSeries/vio.h
rename to include/asm-powerpc/iseries/vio.h