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 59916393ddeb360b843d9289cecae399caaf7937..49e7e4b85847558bacba928922d85166615075dc 100644 (file)
--- 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 d607ebaef270a8496c561dc5721b3628adea71d0..c27a66876c2cd042bf32c7f0fff36d652ec63a1f 100644 (file)
--- 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 72dfcb6d4dda9ebe67e3cb6911f05aff9a5a283d..fe97bfbf7463fad9231b4dd411c62b0066a84540 100644 (file)
--- 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 436f169baf02604bbe75180e23802160dd4b3166..2d518aa2720a517f3c3c292550dc18abfedb6e1e 100644 (file)
--- 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 cb87d270b6bb9df5771a36fb1aebfe554e54c3b4..b5191780ecca44ae9abf782a6a7c04f57916d3f2 100644 (file)
--- 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 694bab3b7bf702896c49fedd9ef686b3b7ac21dd..98601c7d04a92bfe58a79a280fe28dd228c05d6b 100644 (file)
--- 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 3242b241d78956fb158a282d3821289e68026565..867cc4e418c777aca7f8d993d0dd5c7584825a37 100644 (file)
--- 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 ed89659ac3bf896b575726d0deff8854434242da..1045872b01752fe93d3976c3b6e77a99086dc696 100644 (file)
--- 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